diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-06-03 14:15:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-06 22:00:21 +0300 |
| commit | 93e02b6e1e845f5178017c0bac4f18077b331499 (patch) | |
| tree | afb809773453e6238ed671461cb4f899f27711e2 /t/annotate-tests.sh | |
| parent | e942292a3e099f03ae23efd3fd9f09f8b512cadf (diff) | |
tests: don't assume a .git/info for .git/info/grafts
Change those tests that assumed that a .git/info directory would be
created for them when writing .git/info/grafts to explicitly create
the directory.
Do this using the new "TEST_CREATE_REPO_NO_TEMPLATE" facility, and use
"mkdir" instead of "mkdir -p" to assert that we don't have the
.git/info already. An exception to this is the "with grafts" test in
"t6001-rev-list-graft.sh". There we're modifying our ".git" state in a
for-loop, in lieu of refactoring that more extensively let's use
"mkdir -p" there.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 09e86f9ba0..71f391fcaf 100644 --- a/t/annotate-tests.sh +++ b/t/annotate-tests.sh @@ -149,7 +149,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 @@ -164,6 +164,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 ' |