pack-objects: flip the use of GIT_TEST_PACK_SPARSE
The environment variable GIT_TEST_PACK_SPARSE was previously used to allow testing the --sparse option for "git pack-objects" in the test suite. This allowed interesting cases of "git push" to also test this algorithm. Since pack.useSparse is now true by default, we do not need this variable to _enable_ the --sparse option, but instead to _disable_ it. This flips how we work with the variable a bit. When checking for the variable, default to a value of -1 for "unset". If unset, then take the default from the repo settings, which is currently 1. Then, the --[no-]sparse command-line option will override either of these settings. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Mar 20, 2020 at 12:38 UTC
2d657ab95fd5be5ebeee43fecec3d7cd94fdd2e4
3 files changed
+6
-5
builtin/pack-objects.c
+2
-2
@@ -3469,9 +3469,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
3469
3470
read_replace_refs = 0;
3471
3472
- sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
3472
+ sparse = git_env_bool("GIT_TEST_PACK_SPARSE", -1);
3473
prepare_repo_settings(the_repository);
3474
- if (!sparse && the_repository->settings.pack_use_sparse != -1)
3474
+ if (sparse < 0)
3475
sparse = the_repository->settings.pack_use_sparse;
3476
3477
reset_pack_idx_option(&pack_idx_opts);
t/README
+3
-3
@@ -386,9 +386,9 @@ GIT_TEST_INDEX_VERSION=<n> exercises the index read/write code path
386
for the index version specified. Can be set to any valid version
387
(currently 2, 3, or 4).
388
389
-GIT_TEST_PACK_SPARSE=<boolean> if enabled will default the pack-objects
390
-builtin to use the sparse object walk. This can still be overridden by
391
-the --no-sparse command-line argument.
389
+GIT_TEST_PACK_SPARSE=<boolean> if disabled will default the pack-objects
390
+builtin to use the non-sparse object walk. This can still be overridden by
391
+the --sparse command-line argument.
392
393
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
394
by overriding the minimum number of cache entries required per thread.
t/t5322-pack-objects-sparse.sh
+1
@@ -107,6 +107,7 @@ test_expect_success 'non-sparse pack-objects' '
107
108
# --sparse is enabled by default by pack.useSparse
109
test_expect_success 'sparse pack-objects' '
110
+ GIT_TEST_PACK_SPARSE=-1 &&
111
git rev-parse \
112
topic1 \
113
topic1^{tree} \