diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-23 09:20:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-23 09:20:30 -0700 |
| commit | d10d0426566153e096c11072d38c9ba16604c2e6 (patch) | |
| tree | e17f3c947af95a3399f14626c10662eaa7deb76d /t | |
| parent | 651847f5bcf468e06f4153a438892e517e005dde (diff) | |
| parent | 69efd53c8154a26cbb98c9c16ceff26060b288a9 (diff) | |
| download | git-d10d0426566153e096c11072d38c9ba16604c2e6.tar.xz | |
Merge branch 'ms/t7605-test-path-is-helpers'
Test updates.
* ms/t7605-test-path-is-helpers:
t7605: use test_path_is_file instead of test -f
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7605-merge-resolve.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh index 5d56c38546..44de97a480 100755 --- a/t/t7605-merge-resolve.sh +++ b/t/t7605-merge-resolve.sh @@ -34,9 +34,9 @@ merge_c1_to_c2_cmds=' test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" && test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" && git diff --exit-code && - test -f c0.c && - test -f c1.c && - test -f c2.c && + test_path_is_file c0.c && + test_path_is_file c1.c && + test_path_is_file c2.c && test 3 = $(git ls-tree -r HEAD | wc -l) && test 3 = $(git ls-files | wc -l) ' |