From: "Lambert Duclos via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Lambert Duclos <lambertddg@gmail.com>,
Lambert Duclos-de Guise <lambertddg@gmail.com>
Subject: [PATCH] t2004: use test_path_is_file instead of test -f
Date: Sat, 21 Feb 2026 17:28:13 +0000 [thread overview]
Message-ID: <pull.2049.git.1771694893208.gitgitgadget@gmail.com> (raw)
From: Lambert Duclos-de Guise <lambertddg@gmail.com>
Replace 'test -f' with the helper function 'test_path_is_file'
to provide better error messages upon failure.
Signed-off-by: Lambert Duclos-de Guise <lambertddg@gmail.com>
---
[GSoC] t2004: use test_path_is_file instead of test -f
Replace 'test -f' with the helper function 'test_path_is_file' to
provide better error messages upon failure.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2049%2FLambertDuclos%2Ft2004-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2049/LambertDuclos/t2004-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2049
t/t2004-checkout-cache-temp.sh | 42 +++++++++++++++++-----------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index b92d96fdc4..0afe0ff7ca 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -42,7 +42,7 @@ test_expect_success 'checkout one stage 0 to temporary file' '
test_line_count = 1 actual &&
test $(cut "-d " -f2 actual) = path1 &&
p=$(cut "-d " -f1 actual) &&
- test -f $p &&
+ test_path_is_file $p &&
test $(cat $p) = tree1path1
'
@@ -55,7 +55,7 @@ test_expect_success 'checkout all stage 0 to temporary files' '
do
test $(grep $f actual | cut "-d " -f2) = $f &&
p=$(grep $f actual | cut "-d " -f1) &&
- test -f $p &&
+ test_path_is_file $p &&
test $(cat $p) = tree1$f || return 1
done
'
@@ -71,7 +71,7 @@ test_expect_success 'checkout one stage 2 to temporary file' '
test_line_count = 1 actual &&
test $(cut "-d " -f2 actual) = path1 &&
p=$(cut "-d " -f1 actual) &&
- test -f $p &&
+ test_path_is_file $p &&
test $(cat $p) = tree2path1
'
@@ -83,7 +83,7 @@ test_expect_success 'checkout all stage 2 to temporary files' '
do
test $(grep $f actual | cut "-d " -f2) = $f &&
p=$(grep $f actual | cut "-d " -f1) &&
- test -f $p &&
+ test_path_is_file $p &&
test $(cat $p) = tree2$f || return 1
done
'
@@ -108,9 +108,9 @@ test_expect_success 'checkout all stages/one file to temporary files' '
test_line_count = 1 actual &&
test $(cut "-d " -f2 actual) = path1 &&
cut "-d " -f1 actual | (read s1 s2 s3 &&
- test -f $s1 &&
- test -f $s2 &&
- test -f $s3 &&
+ test_path_is_file $s1 &&
+ test_path_is_file $s2 &&
+ test_path_is_file $s3 &&
test $(cat $s1) = tree1path1 &&
test $(cat $s2) = tree2path1 &&
test $(cat $s3) = tree3path1)
@@ -143,8 +143,8 @@ test_expect_success 'checkout some stages/one file to temporary files' '
test $(cut "-d " -f2 actual) = path2 &&
cut "-d " -f1 actual | (read s1 s2 s3 &&
test $s1 = . &&
- test -f $s2 &&
- test -f $s3 &&
+ test_path_is_file $s2 &&
+ test_path_is_file $s3 &&
test $(cat $s2) = tree2path2 &&
test $(cat $s3) = tree3path2)
'
@@ -162,9 +162,9 @@ test_expect_success '-- path0: no entry' '
test_expect_success '-- path1: all 3 stages' '
test $(grep path1 actual | cut "-d " -f2) = path1 &&
grep path1 actual | cut "-d " -f1 | (read s1 s2 s3 &&
- test -f $s1 &&
- test -f $s2 &&
- test -f $s3 &&
+ test_path_is_file $s1 &&
+ test_path_is_file $s2 &&
+ test_path_is_file $s3 &&
test $(cat $s1) = tree1path1 &&
test $(cat $s2) = tree2path1 &&
test $(cat $s3) = tree3path1)
@@ -174,8 +174,8 @@ test_expect_success '-- path2: no stage 1, have stage 2 and 3' '
test $(grep path2 actual | cut "-d " -f2) = path2 &&
grep path2 actual | cut "-d " -f1 | (read s1 s2 s3 &&
test $s1 = . &&
- test -f $s2 &&
- test -f $s3 &&
+ test_path_is_file $s2 &&
+ test_path_is_file $s3 &&
test $(cat $s2) = tree2path2 &&
test $(cat $s3) = tree3path2)
'
@@ -183,9 +183,9 @@ test_expect_success '-- path2: no stage 1, have stage 2 and 3' '
test_expect_success '-- path3: no stage 2, have stage 1 and 3' '
test $(grep path3 actual | cut "-d " -f2) = path3 &&
grep path3 actual | cut "-d " -f1 | (read s1 s2 s3 &&
- test -f $s1 &&
+ test_path_is_file $s1 &&
test $s2 = . &&
- test -f $s3 &&
+ test_path_is_file $s3 &&
test $(cat $s1) = tree1path3 &&
test $(cat $s3) = tree3path3)
'
@@ -193,8 +193,8 @@ test_expect_success '-- path3: no stage 2, have stage 1 and 3' '
test_expect_success '-- path4: no stage 3, have stage 1 and 3' '
test $(grep path4 actual | cut "-d " -f2) = path4 &&
grep path4 actual | cut "-d " -f1 | (read s1 s2 s3 &&
- test -f $s1 &&
- test -f $s2 &&
+ test_path_is_file $s1 &&
+ test_path_is_file $s2 &&
test $s3 = . &&
test $(cat $s1) = tree1path4 &&
test $(cat $s2) = tree2path4)
@@ -203,7 +203,7 @@ test_expect_success '-- path4: no stage 3, have stage 1 and 3' '
test_expect_success '-- asubdir/path5: no stage 2 and 3 have stage 1' '
test $(grep asubdir/path5 actual | cut "-d " -f2) = asubdir/path5 &&
grep asubdir/path5 actual | cut "-d " -f1 | (read s1 s2 s3 &&
- test -f $s1 &&
+ test_path_is_file $s1 &&
test $s2 = . &&
test $s3 = . &&
test $(cat $s1) = tree1asubdir/path5)
@@ -216,7 +216,7 @@ test_expect_success 'checkout --temp within subdir' '
test_line_count = 1 actual &&
test $(grep path5 actual | cut "-d " -f2) = path5 &&
grep path5 actual | cut "-d " -f1 | (read s1 s2 s3 &&
- test -f ../$s1 &&
+ test_path_is_file ../$s1 &&
test $s2 = . &&
test $s3 = . &&
test $(cat ../$s1) = tree1asubdir/path5)
@@ -230,7 +230,7 @@ test_expect_success 'checkout --temp symlink' '
test_line_count = 1 actual &&
test $(cut "-d " -f2 actual) = path6 &&
p=$(cut "-d " -f1 actual) &&
- test -f $p &&
+ test_path_is_file $p &&
test $(cat $p) = path7
'
base-commit: 67ad42147a7acc2af6074753ebd03d904476118f
--
gitgitgadget
next reply other threads:[~2026-02-21 17:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-21 17:28 Lambert Duclos via GitGitGadget [this message]
2026-02-22 9:44 ` [PATCH] t2004: use test_path_is_file instead of test -f Usman Akinyemi
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.2049.git.1771694893208.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=lambertddg@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox