mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7601: use "test_path_is_file" etc. instead of "test -f"

Browse Source 
Some tests in t7601 use "test -f" and "test ! -f" to see if a path
exists or is missing.

Use test_path_is_file and test_path_is_missing helper functions to
clarify these tests a bit better. This especially matters for the
"missing" case because "test ! -f F" will be happy if "F" exists as a
directory, but the intent of the test is that "F" should not exist, even
as a directory. The updated code expresses this better.

Signed-off-by: Dorcas AnonoLitunya <anonolitunya@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Dorcas AnonoLitunya
2023-10-18 15:45:12 +03:00
committed by Junio C Hamano
parent 813d9a9188
commit 5abb758118
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
t/t7601-merge-pull-config.sh
View File

@ -349,13 +349,13 @@ test_expect_success 'Cannot rebase with multiple heads' '
test_expect_success 'merge c1 with c2' ' test_expect_success 'merge c1 with c2' '
git reset --hard c1 && git reset --hard c1 &&
test -f c0.c && test_path_is_file c0.c &&
test -f c1.c && test_path_is_file c1.c &&
test ! -f c2.c && test_path_is_missing c2.c &&
test ! -f c3.c && test_path_is_missing c3.c &&
git merge c2 && git merge c2 &&
test -f c1.c && test_path_is_file c1.c &&
test -f c2.c test_path_is_file c2.c
' '
test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
@ -411,8 +411,8 @@ test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
git reset --hard c1 && git reset --hard c1 &&
git config pull.twohead ours && git config pull.twohead ours &&
git merge c2 && git merge c2 &&
test -f c1.c && test_path_is_file c1.c &&
! test -f c2.c test_path_is_missing c2.c
' '
test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' ' test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' '
@ -431,10 +431,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
git diff --exit-code && git diff --exit-code &&
test -f c0.c && test_path_is_file c0.c &&
test -f c1.c && test_path_is_file c1.c &&
test -f c2.c && test_path_is_file c2.c &&
test -f c3.c test_path_is_file c3.c
' '
conflict_count() conflict_count()