diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-18 15:30:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-18 15:30:33 -0800 |
| commit | 5dd710cb628d10abe95fac61afb35cf798779589 (patch) | |
| tree | 9f405efac965ba9359d4c607bceb6ee3e90be1fc | |
| parent | 716b00e6e9e661c055de1b5baf440279c23f2da0 (diff) | |
| parent | f1cc562b77053ced18eebaae2febe5ff6d5e2690 (diff) | |
| download | git-5dd710cb628d10abe95fac61afb35cf798779589.tar.xz | |
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
| -rwxr-xr-x | t/t7603-merge-reduce-heads.sh | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh index 4887ca705b..1f8c3b7ccb 100755 --- a/t/t7603-merge-reduce-heads.sh +++ b/t/t7603-merge-reduce-heads.sh @@ -52,12 +52,12 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' ' test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && - test -f c3.c && - test -f c4.c && - test -f c5.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 && + test_path_is_file c4.c && + test_path_is_file c5.c && git show --format=%s -s >actual && ! grep c1 actual && grep c2 actual && @@ -75,12 +75,12 @@ test_expect_success 'pull c2, c3, c4, c5 into c1' ' test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" && test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && - test -f c3.c && - test -f c4.c && - test -f c5.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 && + test_path_is_file c4.c && + test_path_is_file c5.c && git show --format=%s -s >actual && ! grep c1 actual && grep c2 actual && |