t9210, t9211: disable GIT_TEST_SPLIT_INDEX for scalar clone tests
index.skipHash (Scalar default) and split-index are incompatible: the shared index gets a null OID when skipHash skips computing the hash, and the null OID causes the shared index to not be loaded on re-read. This triggers a BUG assertion in fsmonitor when the fsmonitor_dirty bitmap references more entries than the (now empty) index has. Disable GIT_TEST_SPLIT_INDEX in the scalar clone tests that hit this: tests 12, 13, and 22 in t9210 (matching the existing workaround in test 16), and all of t9211 (every test does scalar clone). Signed-off-by: Paul Tarjan <github@paulisageek.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Paul Tarjan committed
Apr 15, 2026 at 13:27 UTC
7cce609e086866d054a1433d0356fa71e55c108d
2 files changed
+11
t/t9210-scalar.sh
+6
@@ -152,6 +152,10 @@ test_expect_success 'set up repository to clone' '
152
'
153
154
test_expect_success 'scalar clone' '
155
+ # index.skipHash (Scalar default) and GIT_TEST_SPLIT_INDEX are
156
+ # incompatible: the shared index gets a null OID and fails to
157
+ # load on re-read.
158
+ sane_unset GIT_TEST_SPLIT_INDEX &&
159
second=$(git rev-parse --verify second:second.t) &&
160
scalar clone "file://$(pwd)" cloned --single-branch &&
161
(
@@ -182,6 +186,7 @@ test_expect_success 'scalar clone' '
186
'
187
188
test_expect_success 'scalar clone --no-... opts' '
189
+ sane_unset GIT_TEST_SPLIT_INDEX &&
190
# Note: redirect stderr always to avoid having a verbose test
191
# run result in a difference in the --[no-]progress option.
192
GIT_TRACE2_EVENT="$(pwd)/no-opt-trace" scalar clone \
@@ -307,6 +312,7 @@ test_expect_success '`scalar [...] <dir>` errors out when dir is missing' '
312
313
SQ="'"
314
test_expect_success UNZIP 'scalar diagnose' '
315
+ sane_unset GIT_TEST_SPLIT_INDEX &&
316
scalar clone "file://$(pwd)" cloned --single-branch &&
317
git repack &&
318
echo "$(pwd)/.git/objects/" >>cloned/src/.git/objects/info/alternates &&
t/t9211-scalar-clone.sh
+5
@@ -8,6 +8,11 @@ test_description='test the `scalar clone` subcommand'
8
GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt,launchctl:true,schtasks:true"
9
export GIT_TEST_MAINT_SCHEDULER
10
11
+# index.skipHash (Scalar default) and GIT_TEST_SPLIT_INDEX are
12
+# incompatible: the shared index gets a null OID and fails to
13
+# load on re-read. Every test here uses scalar clone.
14
+sane_unset GIT_TEST_SPLIT_INDEX
15
+
16
test_expect_success 'set up repository to clone' '
17
rm -rf .git &&
18
git init to-clone &&