Git fork

Merge branch 'lo/t7603-path-is-file-update'

Test clean-up.

* lo/t7603-path-is-file-update:
t7603: replace test -f by test_path_is_file

+12 -12
+12 -12
t/t7603-merge-reduce-heads.sh
··· 52 52 test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && 53 53 test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" && 54 54 git diff --exit-code && 55 - test -f c0.c && 56 - test -f c1.c && 57 - test -f c2.c && 58 - test -f c3.c && 59 - test -f c4.c && 60 - test -f c5.c && 55 + test_path_is_file c0.c && 56 + test_path_is_file c1.c && 57 + test_path_is_file c2.c && 58 + test_path_is_file c3.c && 59 + test_path_is_file c4.c && 60 + test_path_is_file c5.c && 61 61 git show --format=%s -s >actual && 62 62 ! grep c1 actual && 63 63 grep c2 actual && ··· 75 75 test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && 76 76 test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" && 77 77 git diff --exit-code && 78 - test -f c0.c && 79 - test -f c1.c && 80 - test -f c2.c && 81 - test -f c3.c && 82 - test -f c4.c && 83 - test -f c5.c && 78 + test_path_is_file c0.c && 79 + test_path_is_file c1.c && 80 + test_path_is_file c2.c && 81 + test_path_is_file c3.c && 82 + test_path_is_file c4.c && 83 + test_path_is_file c5.c && 84 84 git show --format=%s -s >actual && 85 85 ! grep c1 actual && 86 86 grep c2 actual &&