diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-18 20:31:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 20:31:55 (GMT) |
| commit | 3d3874d537af1149c85b73d7c4317ed1b0d0b419 (patch) | |
| tree | 577fde64cf3c19bd7a39bc526a02d49b17113f49 /t/annotate-tests.sh | |
| parent | 48e88a4862f3f0353f7a795dae0346dca0043829 (diff) | |
| parent | ead74601c6ed7171e9e736e329b45c12d90153e4 (diff) | |
| download | git-3d3874d537af1149c85b73d7c4317ed1b0d0b419.zip git-3d3874d537af1149c85b73d7c4317ed1b0d0b419.tar.gz git-3d3874d537af1149c85b73d7c4317ed1b0d0b419.tar.bz2 | |
Merge branch 'ab/test-without-templates'
Tweak tests so that they still work when the "git init" template
did not create .git/info directory.
* ab/test-without-templates:
tests: don't assume a .git/info for .git/info/sparse-checkout
tests: don't assume a .git/info for .git/info/exclude
tests: don't assume a .git/info for .git/info/refs
tests: don't assume a .git/info for .git/info/attributes
tests: don't assume a .git/info for .git/info/grafts
tests: don't depend on template-created .git/branches
t0008: don't rely on default ".git/info/exclude"
Diffstat (limited to 't/annotate-tests.sh')
| -rw-r--r-- | t/annotate-tests.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh index cc01d89..f1b9a6c 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -153,7 +153,7 @@ test_expect_success 'blame evil merge' ' test_expect_success 'blame huge graft' ' test_when_finished "git checkout branch2" && - test_when_finished "rm -f .git/info/grafts" && + test_when_finished "rm -rf .git/info" && graft= && for i in 0 1 2 do @@ -168,6 +168,7 @@ test_expect_success 'blame huge graft' ' graft="$graft$commit " || return 1 done done && + mkdir .git/info && printf "%s " $graft >.git/info/grafts && check_count -h 00 01 1 10 1 ' |