test-read-cache: remove --table, --expand options

This commit effectively reverts 2782db3 (test-tool: don't force full
index, 2021-03-30) and e2df6c3 (test-read-cache: print cache entries
with --table, 2021-03-30) to remove the --table and --expand options
from 'test-tool read-cache'. The previous changes already removed these
options from the test suite in favor of 'git ls-files --sparse'.

The initial thought of creating these options was to allow for tests to
see additional information with every cache entry. In particular, the
object type is still not mirrored in 'git ls-files'. Since sparse
directory entries always end with a slash, the object type is not
critical to verify the sparse index is enabled. It was thought that it
would be helpful to have additional information, such as flags, but that
was not needed for the FS Monitor integration and hasn't been needed
since.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index 0d9f08931a15f10a546ea2a9840f733cfb9955e0..b736ef16421ba14e81f8e8c1654d936051efecbb 100644 (file)
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,83 +1,39 @@
 #include "test-tool.h"
 #include "cache.h"
 #include "config.h"
-#include "blob.h"
-#include "commit.h"
-#include "tree.h"
-#include "sparse-index.h"
-
-static void print_cache_entry(struct cache_entry *ce)
-{
-       const char *type;
-       printf("%06o ", ce->ce_mode & 0177777);
-
-       if (S_ISSPARSEDIR(ce->ce_mode))
-               type = tree_type;
-       else if (S_ISGITLINK(ce->ce_mode))
-               type = commit_type;
-       else
-               type = blob_type;
-
-       printf("%s %s\t%s\n",
-              type,
-              oid_to_hex(&ce->oid),
-              ce->name);
-}
-
-static void print_cache(struct index_state *istate)
-{
-       int i;
-       for (i = 0; i < istate->cache_nr; i++)
-               print_cache_entry(istate->cache[i]);
-}
 
 int cmd__read_cache(int argc, const char **argv)
 {
-       struct repository *r = the_repository;
        int i, cnt = 1;
        const char *name = NULL;
-       int table = 0, expand = 0;
 
        initialize_the_repository();
 
-       for (++argv, --argc; *argv && starts_with(*argv, "--"); ++argv, --argc) {
-               if (skip_prefix(*argv, "--print-and-refresh=", &name))
-                       continue;
-               if (!strcmp(*argv, "--table"))
-                       table = 1;
-               else if (!strcmp(*argv, "--expand"))
-                       expand = 1;
+       if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
+               argc--;
+               argv++;
        }
 
-       if (argc == 1)
-               cnt = strtol(argv[0], NULL, 0);
+       if (argc == 2)
+               cnt = strtol(argv[1], NULL, 0);
        setup_git_directory();
        git_config(git_default_config, NULL);
 
-       prepare_repo_settings(r);
-       r->settings.command_requires_full_index = 0;
-
        for (i = 0; i < cnt; i++) {
-               repo_read_index(r);
-
-               if (expand)
-                       ensure_full_index(r->index);
-
+               read_cache();
                if (name) {
                        int pos;
 
-                       refresh_index(r->index, REFRESH_QUIET,
+                       refresh_index(&the_index, REFRESH_QUIET,
                                      NULL, NULL, NULL);
-                       pos = index_name_pos(r->index, name, strlen(name));
+                       pos = index_name_pos(&the_index, name, strlen(name));
                        if (pos < 0)
                                die("%s not in index", name);
                        printf("%s is%s up to date\n", name,
-                              ce_uptodate(r->index->cache[pos]) ? "" : " not");
+                              ce_uptodate(the_index.cache[pos]) ? "" : " not");
                        write_file(name, "%d\n", i);
                }
-               if (table)
-                       print_cache(r->index);
-               discard_index(r->index);
+               discard_cache();
        }
        return 0;
 }