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 Singh <mansimaanu8627@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mansi Singh committed
Mar 10, 2026 at 22:50 UTC
69efd53c8154a26cbb98c9c16ceff26060b288a9
1 file changed
+3
-3
t/t7605-merge-resolve.sh
+3
-3
@@ -34,9 +34,9 @@ merge_c1_to_c2_cmds='
34
test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
35
test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
36
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 &&
40
test 3 = $(git ls-tree -r HEAD | wc -l) &&
41
test 3 = $(git ls-files | wc -l)
42
'