diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-23 13:39:52 -0800 |
| commit | 5287319bf8c079cca6ce06231f3e25cc3b68dd34 (patch) | |
| tree | 33de9f710bf39333474422709b93ac0660f554df | |
| parent | Merge branch 'jc/format-patch-v-unleak' (diff) | |
| parent | t1600: fix racy index.skipHash test (diff) | |
| download | git-5287319bf8c079cca6ce06231f3e25cc3b68dd34.tar.gz git-5287319bf8c079cca6ce06231f3e25cc3b68dd34.zip | |
Merge branch 'ds/omit-trailing-hash-in-index'
Quickfix for a topic already in 'master'.
* ds/omit-trailing-hash-in-index:
t1600: fix racy index.skipHash test
| -rwxr-xr-x | t/t1600-index.sh | 1 |
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 && |