diff options
| author | Mansi Singh <mansimaanu8627@gmail.com> | 2026-03-10 22:50:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-10 16:25:10 -0700 |
| commit | 69efd53c8154a26cbb98c9c16ceff26060b288a9 (patch) | |
| tree | 120c71db767138de685fd898007191aff201357e /t | |
| parent | 67ad42147a7acc2af6074753ebd03d904476118f (diff) | |
| download | git-69efd53c8154a26cbb98c9c16ceff26060b288a9.tar.xz | |
t7605: use test_path_is_file instead of test -f
Replace old-style 'test -f' path checks with the modern
test_path_is_file helper in the merge_c1_to_c2_cmds block.
The helper provides clearer failure messages and is the
established convention in Git's test suite.
Signed-off-by: Mansi Singh <mansimaanu8627@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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) ' |