From: "Srujith A Poojary via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Harald Nordgren <haraldnordgren@gmail.com>,
Usman Akinyemi <usmanakinyemi202@gmail.com>,
Srujith A Poojary <poojarysrujith@gmail.com>,
Srujith Poojary <poojarysrujith@gmail.com>
Subject: [PATCH v3] [Outreachy PATCH] t2030: modernize test path checks
Date: Sun, 18 Oct 2026 05:05:43 +0000 [thread overview]
Message-ID: <pull.2256.v3.git.1792299943380.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2256.git.1791978767497.gitgitgadget@gmail.com>
From: Srujith Poojary <poojarysrujith@gmail.com>
Replace old-style file checks with test_path_is_file and the helper
test_path_is_missing for clearer failure diagnostics in test output.
Signed-off-by: Srujith Poojary <poojarysrujith@gmail.com>
---
t2030: modernize test path checks
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2256%2Fpoojarysrujith%2Fmicroproject-modernize-path-check-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/2256
Range-diff vs v2:
1: 93cf6c12f4 ! 1: 75086e1db0 [Outreachy PATCH] t2030: modernize test path checks
@@ Commit message
test_path_is_missing for clearer failure diagnostics in test output.
- Search with: git grep "test -[efd]" t/
-
Signed-off-by: Srujith Poojary <poojarysrujith@gmail.com>
## t/t2030-unresolve-info.sh ##
@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget' '
tr "\0" "\n" <.git/MERGE_RR >actual &&
echo "$rerere_id fi/le" >expect &&
test_cmp expect actual
+@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget (subdirectory)' '
+ (cd fi && git rerere) &&
+ rerere_id=$(cd .git/rr-cache && echo */postimage) &&
+ rerere_id=${rerere_id%/postimage} &&
+- test -f .git/rr-cache/$rerere_id/postimage &&
++ test_path_is_file .git/rr-cache/$rerere_id/postimage &&
+ (cd fi && git checkout -m le) &&
+ echo resurrect the conflict &&
+ test_grep "^=======" fi/le &&
+@@ t/t2030-unresolve-info.sh: test_expect_success 'rerere and rerere forget (subdirectory)' '
+ check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
+ test -z "$(git ls-files -u)" &&
+ (cd fi && git rerere forget le) &&
+- ! test -f .git/rr-cache/$rerere_id/postimage &&
++ test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
+ tr "\0" "\n" <.git/MERGE_RR >actual &&
+ echo "$rerere_id fi/le" >expect &&
+ test_cmp expect actual
t/t2030-unresolve-info.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 9af24b1204..f6f5dd7cb8 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -170,7 +170,7 @@ test_expect_success 'rerere and rerere forget' '
git rerere &&
rerere_id=$(cd .git/rr-cache && echo */postimage) &&
rerere_id=${rerere_id%/postimage} &&
- test -f .git/rr-cache/$rerere_id/postimage &&
+ test_path_is_file .git/rr-cache/$rerere_id/postimage &&
git checkout -m fi/le &&
echo resurrect the conflict &&
test_grep "^=======" fi/le &&
@@ -182,7 +182,7 @@ test_expect_success 'rerere and rerere forget' '
check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
test -z "$(git ls-files -u)" &&
git rerere forget fi/le &&
- ! test -f .git/rr-cache/$rerere_id/postimage &&
+ test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
tr "\0" "\n" <.git/MERGE_RR >actual &&
echo "$rerere_id fi/le" >expect &&
test_cmp expect actual
@@ -196,7 +196,7 @@ test_expect_success 'rerere and rerere forget (subdirectory)' '
(cd fi && git rerere) &&
rerere_id=$(cd .git/rr-cache && echo */postimage) &&
rerere_id=${rerere_id%/postimage} &&
- test -f .git/rr-cache/$rerere_id/postimage &&
+ test_path_is_file .git/rr-cache/$rerere_id/postimage &&
(cd fi && git checkout -m le) &&
echo resurrect the conflict &&
test_grep "^=======" fi/le &&
@@ -208,7 +208,7 @@ test_expect_success 'rerere and rerere forget (subdirectory)' '
check_resolve_undo kept fi/le initial:fi/le second:fi/le third:fi/le &&
test -z "$(git ls-files -u)" &&
(cd fi && git rerere forget le) &&
- ! test -f .git/rr-cache/$rerere_id/postimage &&
+ test_path_is_missing .git/rr-cache/$rerere_id/postimage &&
tr "\0" "\n" <.git/MERGE_RR >actual &&
echo "$rerere_id fi/le" >expect &&
test_cmp expect actual
base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
--
gitgitgadget
prev parent reply other threads:[~2026-10-18 5:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 11:52 [PATCH] t2030: modernize test path checks Srujith A Poojary via GitGitGadget
2026-10-16 7:25 ` [PATCH v2] [Outreachy PATCH] " Srujith A Poojary via GitGitGadget
2026-10-16 8:36 ` Harald Nordgren
2026-10-16 8:50 ` Srujith Poojary
2026-10-16 9:35 ` Usman Akinyemi
2026-10-16 10:16 ` Srujith Poojary
2026-10-16 9:18 ` Usman Akinyemi
2026-10-18 5:05 ` Srujith A Poojary via GitGitGadget [this message]
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.2256.v3.git.1792299943380.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=haraldnordgren@gmail.com \
--cc=poojarysrujith@gmail.com \
--cc=usmanakinyemi202@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.