diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-30 07:09:56 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-30 07:09:56 +0900 |
commit | 3a5e77e3467c9487424867c09c4253b68f83e970 (patch) | |
tree | b2f162e4ec245fc46055dd6529eb109a6e4bac8a | |
parent | 1551066dc5724d2bfdc88e8f920eb64077db9dfa (diff) | |
parent | 5abb758118ebbc85fce114176722670c858f4b62 (diff) | |
download | git-3a5e77e3467c9487424867c09c4253b68f83e970.tar.gz |
Merge branch 'da/t7601-style-fix'
Coding style update.
* da/t7601-style-fix:
t7601: use "test_path_is_file" etc. instead of "test -f"
-rwxr-xr-x | t/t7601-merge-pull-config.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh index bd238d89b0..e08767df66 100755 --- a/t/t7601-merge-pull-config.sh +++ b/t/t7601-merge-pull-config.sh @@ -349,13 +349,13 @@ test_expect_success 'Cannot rebase with multiple heads' ' test_expect_success 'merge c1 with c2' ' git reset --hard c1 && - test -f c0.c && - test -f c1.c && - test ! -f c2.c && - test ! -f c3.c && + test_path_is_file c0.c && + test_path_is_file c1.c && + test_path_is_missing c2.c && + test_path_is_missing c3.c && git merge c2 && - test -f c1.c && - test -f c2.c + test_path_is_file c1.c && + test_path_is_file c2.c ' test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' ' @@ -411,8 +411,8 @@ test_expect_success 'merge c1 with c2 (ours in pull.twohead)' ' git reset --hard c1 && git config pull.twohead ours && git merge c2 && - test -f c1.c && - ! test -f c2.c + test_path_is_file c1.c && + test_path_is_missing c2.c ' test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' ' @@ -431,10 +431,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && - test -f c3.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 ' conflict_count() |