From: Derrick Stolee Date: Fri, 12 Dec 2025 15:15:25 +0000 (+0000) Subject: scalar: use index.skipHash=true for performance X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05f28e4b3cc1f873e510e5692b70290c515abb98;p=thirdparty%2Fgit.git scalar: use index.skipHash=true for performance The index.skipHash config option has been set to 'false' by Scalar since 4933152cbb (scalar: enable path-walk during push via config, 2025-05-16) but that commit message is trying to communicate the exact opposite: that the 'true' value is what we want instead. This means that we've been disabling this performance benefit for Scalar repos unintentionally. Fix this issue before we add justification for the config options set in this list. Oddly, enabling index.skipHash causes a test issue during 'test_commit' in one of the Scalar tests when GIT_TEST_SPLIT_INDEX is enabled (as caught by the linux-test-vars build). I'm fixing the test by disabling the environment variable, but the issue should be resolved in a series focused on the split index. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano --- 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