aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scalar.c2
-rwxr-xr-xt/t9210-scalar.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/scalar.c b/scalar.c
index 1c7bd1a8f8..55b8542770 100644
--- a/scalar.c
+++ b/scalar.c
@@ -160,7 +160,7 @@ static int set_recommended_config(int reconfigure)
{ "credential.validate", "false", 1 }, /* GCM4W-only */
{ "gc.auto", "0", 1 },
{ "gui.GCWarning", "false", 1 },
- { "index.skipHash", "false", 1 },
+ { "index.skipHash", "true", 1 },
{ "index.threads", "true", 1 },
{ "index.version", "4", 1 },
{ "merge.stat", "false", 1 },
diff --git a/t/t9210-scalar.sh b/t/t9210-scalar.sh
index 43c210a23d..923c243c13 100755
--- a/t/t9210-scalar.sh
+++ b/t/t9210-scalar.sh
@@ -246,6 +246,10 @@ test_expect_success 'scalar reconfigure --all with includeIf.onbranch' '
'
test_expect_success 'scalar reconfigure --all with detached HEADs' '
+ # This test demonstrates an issue with index.skipHash=true and
+ # this test variable for the split index. Disable the test variable.
+ sane_unset GIT_TEST_SPLIT_INDEX &&
+
repos="two three four" &&
for num in $repos
do