From: Mansi Singh via GitGitGadget Date: Thu, 26 Feb 2026 00:57:58 GMT Subject: [PATCH v2] t7605: use test_path_is_file instead of test -f Message-ID: In-Reply-To: From: Mansi 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 --- t7605: use test_path_is_file instead of test -f cc: Lucas Seiki Oshiro lucasseikioshiro@gmail.com Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2050%2FMansiSingh17%2Fgsoc-t7605-test-path-helpers-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2050/MansiSingh17/gsoc-t7605-test-path-helpers-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/2050 Range-diff vs v1: 1: 11724e9310 ! 1: 0a0c9de263 t7605: use test_path_is_file instead of test -f @@ Commit message The helper provides clearer failure messages and is the established convention in Git's test suite. - These instances were found using: - grep -rn "test -[efd]" t/ --include="*.sh" - Signed-off-by: Mansi ## t/t7605-merge-resolve.sh ## t/t7605-merge-resolve.sh | 6 +++--- 1 file 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) ' base-commit: 7c02d39fc2ed2702223c7674f73150d9a7e61ba4 -- gitgitgadget