Skip to content

Commit 5dd710c

Browse files
committed
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
2 parents 716b00e + f1cc562 commit 5dd710c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

t/t7603-merge-reduce-heads.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' '
5252
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
5353
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
5454
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 &&
6161
git show --format=%s -s >actual &&
6262
! grep c1 actual &&
6363
grep c2 actual &&
@@ -75,12 +75,12 @@ test_expect_success 'pull c2, c3, c4, c5 into c1' '
7575
test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
7676
test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
7777
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 &&
8484
git show --format=%s -s >actual &&
8585
! grep c1 actual &&
8686
grep c2 actual &&

0 commit comments

Comments
 (0)