Skip to content

Commit 0a0c9de

Browse files
committed
t7605: use test_path_is_file instead of test -f
Replace old-style 'test -f' path checks with the modern test_path_is_file helper in the merge_c1_to_c2_cmds block. The helper provides clearer failure messages and is the established convention in Git's test suite. Signed-off-by: Mansi <mansimaanu8627@gmail.com>
1 parent 7c02d39 commit 0a0c9de

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

t/t7605-merge-resolve.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds='
3434
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
3535
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
3636
git diff --exit-code &&
37-
test -f c0.c &&
38-
test -f c1.c &&
39-
test -f c2.c &&
37+
test_path_is_file c0.c &&
38+
test_path_is_file c1.c &&
39+
test_path_is_file c2.c &&
4040
test 3 = $(git ls-tree -r HEAD | wc -l) &&
4141
test 3 = $(git ls-files | wc -l)
4242
'

0 commit comments

Comments
 (0)