Skip to content

Commit

Permalink
t7603: replace test -f by test_path_is_file
Browse files Browse the repository at this point in the history
`test_path_is_file` provides a better output when asserting whether a
file exists. Replace the occurrences of `test -f` in t7603 with it,
facilitating the trace of possible test failures.

Signed-off-by: Lucas Oshiro <[email protected]>
Acked-by: Patrick Steinhardt <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
lucasoshiro authored and gitster committed Feb 10, 2025
1 parent f93ff17 commit f1cc562
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions t/t7603-merge-reduce-heads.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' '
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test -f c3.c &&
test -f c4.c &&
test -f c5.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test_path_is_file c3.c &&
test_path_is_file c4.c &&
test_path_is_file c5.c &&
git show --format=%s -s >actual &&
! grep c1 actual &&
grep c2 actual &&
Expand All @@ -75,12 +75,12 @@ test_expect_success 'pull c2, c3, c4, c5 into c1' '
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
git diff --exit-code &&
test -f c0.c &&
test -f c1.c &&
test -f c2.c &&
test -f c3.c &&
test -f c4.c &&
test -f c5.c &&
test_path_is_file c0.c &&
test_path_is_file c1.c &&
test_path_is_file c2.c &&
test_path_is_file c3.c &&
test_path_is_file c4.c &&
test_path_is_file c5.c &&
git show --format=%s -s >actual &&
! grep c1 actual &&
grep c2 actual &&
Expand Down

0 comments on commit f1cc562

Please sign in to comment.