t: support GIT_TEST_WRITE_REV_INDEX

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. Additionally, enable this mode in the second
run of tests under linux-gcc in 'ci/run-build-and-tests.sh'.

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index d5cd665b98bcbafe0c80cc2873e8885e739c7fbd..54f74c48741df84f35cc5269c332b51a347f7fa0 100644 (file)
--- 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 d784569200b1cc96d4a9f7180d85f5f829843f82..24df0c98f743a87a6cdc558aa7ac324c95e5d1ad 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3601,6 +3601,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/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 50e0b90073f13307f902286dd3bad560363d05f1..a66b5e8c75aec2e4a9ea80227a8b492c8efcdf8d 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -24,6 +24,7 @@ linux-gcc)
        export GIT_TEST_MULTI_PACK_INDEX=1
        export GIT_TEST_ADD_I_USE_BUILTIN=1
        export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+       export GIT_TEST_WRITE_REV_INDEX=1
        make test
        ;;
 linux-clang)

diff --git a/pack-revindex.h b/pack-revindex.h
index 61b2f3ab75556ee335a901f78658c1f7b8b166d9..d1a0595e892dfb4bfe1e5e775b88839a8fc48be5 100644 (file)
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -16,9 +16,12 @@
  *   can be found
  */
 
+
 #define RIDX_SIGNATURE 0x52494458 /* "RIDX" */
 #define RIDX_VERSION 1
 
+#define GIT_TEST_WRITE_REV_INDEX "GIT_TEST_WRITE_REV_INDEX"
+
 struct packed_git;
 
 /*

diff --git a/t/README b/t/README
index c730a7077057d4104a8d4f18737309a2e2dcbdf4..0f97a516407650ab61f5694b3e0e6c06efce5c3c 100644 (file)
--- 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
 ------------