From: "Mansi Singh via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Mansi Singh <mansimaanu8627@gmail.com>, Mansi <mansimaanu8627@gmail.com>
Subject: [PATCH] t7605: use test_path_is_file instead of test -f
Date: Tue, 24 Feb 2026 05:34:28 +0000 [thread overview]
Message-ID: <pull.2050.git.1771911268805.gitgitgadget@gmail.com> (raw)
From: Mansi <mansimaanu8627@gmail.com>
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.
These instances were found using:
grep -rn "test -[efd]" t/ --include="*.sh"
Signed-off-by: Mansi <mansimaanu8627@gmail.com>
---
t7605: use test_path_is_file instead of test -f
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2050%2FMansiSingh17%2Fgsoc-t7605-test-path-helpers-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2050/MansiSingh17/gsoc-t7605-test-path-helpers-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2050
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
next reply other threads:[~2026-02-24 5:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-24 5:34 Mansi Singh via GitGitGadget [this message]
2026-02-25 19:04 ` [PATCH] t7605: use test_path_is_file instead of test -f Lucas Seiki Oshiro
2026-02-26 0:57 ` [PATCH v2] " Mansi Singh via GitGitGadget
-- strict thread matches above, loose matches on Subject: below --
2026-03-10 5:33 [PATCH] " Mansi Singh via GitGitGadget
2026-03-10 13:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.2050.git.1771911268805.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=mansimaanu8627@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.