summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-03-30 13:10:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-30 19:57:46 (GMT)
commit2782db3eed808c2a5097ccd5af813d3338c5f313 (patch)
tree6ac56cfd3574b97ba9e7f9a1471d2b6aba3ba663 /t/helper
parente2df6c397206c3c0791fb50466789730e8a334d8 (diff)
downloadgit-2782db3eed808c2a5097ccd5af813d3338c5f313.zip
git-2782db3eed808c2a5097ccd5af813d3338c5f313.tar.gz
git-2782db3eed808c2a5097ccd5af813d3338c5f313.tar.bz2
test-tool: don't force full index
We will use 'test-tool read-cache --table' to check that a sparse index is written as part of init_repos. Since we will no longer always expand a sparse index into a full index, add an '--expand' parameter that adds a call to ensure_full_index() so we can compare a sparse index directly against a full index, or at least what the in-memory index looks like when expanded in this way. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-read-cache.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index 6cfd8f2..b52c174 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -4,6 +4,7 @@
#include "blob.h"
#include "commit.h"
#include "tree.h"
+#include "sparse-index.h"
static void print_cache_entry(struct cache_entry *ce)
{
@@ -35,13 +36,19 @@ 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;
+ int table = 0, expand = 0;
+
+ initialize_the_repository();
+ prepare_repo_settings(r);
+ r->settings.command_requires_full_index = 0;
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)
@@ -51,6 +58,10 @@ int cmd__read_cache(int argc, const char **argv)
for (i = 0; i < cnt; i++) {
repo_read_index(r);
+
+ if (expand)
+ ensure_full_index(r->index);
+
if (name) {
int pos;