aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-01-17 14:31:40 -0800
committerJunio C Hamano <gitster@pobox.com>2023-01-17 14:31:40 -0800
commitdc71be4fda7f68a813589792d14a7622aa0ed0a6 (patch)
treeda199052db427e1dd792d0268e888d0b5e07f03e
parent73f69f22e590c2ddc2c6fb678a5b11d9d0ba39fa (diff)
parent42ea7a41502718ca9622a2f32dedaddc92b00a0b (diff)
downloadgit-dc71be4fda7f68a813589792d14a7622aa0ed0a6.tar.xz
Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users
* ds/omit-trailing-hash-in-index: t1600: fix racy index.skipHash test
-rwxr-xr-xt/t1600-index.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index 0ebbae1305..9368d82f7d 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -88,6 +88,7 @@ test_expect_success 'index.skipHash config option' '
git -c protocol.file.allow=always submodule add ./ sub &&
git config index.skipHash false &&
git -C sub config index.skipHash true &&
+ rm -f .git/modules/sub/index &&
>sub/file &&
git -C sub add a &&
test_trailing_hash .git/modules/sub/index >hash &&