[PATCH 7/8] t: support GIT_TEST_WRITE_REV_INDEX
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Jan 8, 2021, 18:20 UTC
- Message-ID
- <3525c4d114c8655953aca44d8effa1652ccc93d3.1610129989.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1610129989.git.me@ttaylorr.com>
Add a new option that unconditionally enables the pack.writeReverseIndex setting in order to run the whole test suite in a mode that generates on-disk reverse indexes.
Once on-disk reverse indexes are proven out over several releases, we can change the default value of that configuration to 'true', and drop this patch.
Signed-off-by: Taylor Blau <me@ttaylorr.com> --- builtin/index-pack.c | 5 ++++- builtin/pack-objects.c | 2 ++ pack-revindex.h | 2 ++ t/README | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 03408250b1..0bde325a8b 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1748,7 +1748,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) if (prefix && chdir(prefix)) die(_("Cannot come back to cwd")); - rev_index = !!(opts.flags & (WRITE_REV_VERIFY | WRITE_REV)); + if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0)) + rev_index = 1; + else + rev_index = !!(opts.flags & (WRITE_REV_VERIFY | WRITE_REV)); for (i = 1; i < argc; i++) { const char *arg = argv[i]; diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 80adce154a..5b3395bd7a 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3597,6 +3597,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); + if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0)) + pack_idx_opts.flags |= WRITE_REV; progress = isatty(2); argc = parse_options(argc, argv, prefix, pack_objects_options, diff --git a/pack-revindex.h b/pack-revindex.h index b501a7cd62..d2d466e298 100644 --- a/pack-revindex.h +++ b/pack-revindex.h @@ -1,6 +1,8 @@ #ifndef PACK_REVINDEX_H #define PACK_REVINDEX_H +#define GIT_TEST_WRITE_REV_INDEX "GIT_TEST_WRITE_REV_INDEX" + struct packed_git; int load_pack_revindex(struct packed_git *p); diff --git a/t/README b/t/README index c730a70770..0f97a51640 100644 --- a/t/README +++ b/t/README @@ -439,6 +439,9 @@ GIT_TEST_DEFAULT_HASH=<hash-algo> specifies which hash algorithm to use in the test scripts. Recognized values for <hash-algo> are "sha1" and "sha256". +GIT_TEST_WRITE_REV_INDEX=<boolean>, when true enables the +'pack.writeReverseIndex' setting. + Naming Tests ------------
-- 2.30.0.138.g6d7191ea01