[PATCH] t2030: modernize test path checks

[PATCH] t2030: modernize test path checks

[Srujith A Poojary via GitGitGadget]

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.

Search with: git grep "test -[efd]" t/

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-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2256

 t/t2030-unresolve-info.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 9af24b1204..56a7f849d6 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

base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
-- 
gitgitgadget

[PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Srujith A Poojary via GitGitGadget]

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.

Search with: git grep "test -[efd]" t/

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-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2256/poojarysrujith/microproject-modernize-path-check-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/2256

Range-diff vs v1:

 1:  641b9330c9 ! 1:  93cf6c12f4 t2030: modernize test path checks
     @@ Metadata
      Author: Srujith Poojary <poojarysrujith@gmail.com>
      
       ## Commit message ##
     -    t2030: modernize test path checks
     +    [Outreachy PATCH] t2030: modernize test path checks
      
          Replace old-style file checks with test_path_is_file and the helper
     +
          test_path_is_missing for clearer failure diagnostics in test output.
      
          Search with: git grep "test -[efd]" t/


 t/t2030-unresolve-info.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 9af24b1204..56a7f849d6 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

base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd
-- 
gitgitgadget

Re: [PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Harald Nordgren]

> +       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 &&

Seems like a good change, but there are lots of these calls in the
codebase. Maybe change the others ones too, while you're at it?


Harald

Re: [PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Srujith Poojary]

Hi Harald,

Thanks for taking a look at my patch!
Since this is for an Outreachy microproject, I kept the scope small to
follow the guidelines. But I completely understand—if it helps, I can
take a look at modernizing some of the other ones too in a separate
patch.

Thanks,
Srujith A Poojary

On Fri, Oct 16, 2026 at 2:06 PM Harald Nordgren
<haraldnordgren@gmail.com> wrote:
>
> > +       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 &&
>
> Seems like a good change, but there are lots of these calls in the
> codebase. Maybe change the others ones too, while you're at it?
>
>
> Harald

Re: [PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Usman Akinyemi]

>
> test_path_is_missing for clearer failure diagnostics in test output.
>
> Search with: git grep "test -[efd]" t/
Please, remove this, it is not needed and kindly go through other
comments on other Outreachy applicant patches.
>
> Signed-off-by: Srujith Poojary <poojarysrujith@gmail.com>
> ---
>     t2030: modernize test path checks

> Range-diff vs v1:
>
>  1:  641b9330c9 ! 1:  93cf6c12f4 t2030: modernize test path checks

I will also advise that whenever you are sending your patches or
sending any query, kindly cc'ed
the mentors for visibility purposes.

Thanks for your interest in the Git project.

Usman

Re: [PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Usman Akinyemi]

> Thanks for taking a look at my patch!
> Since this is for an Outreachy microproject, I kept the scope small to
> follow the guidelines. But I completely understand—if it helps, I can
> take a look at modernizing some of the other ones too in a separate
> patch.
Firstly, do not toppost when replying to a message at Git. Use inline comments.
While the guidelines talked about keeping the changes small, which is valid.
But, that file has about four instances of the same "test -f", that is
not a big change.
You can change all of those instances.

The main idea of Microproject is to get you familiar with the Git workflow.
> >
> > Seems like a good change, but there are lots of these calls in the
> > codebase. Maybe change the others ones too, while you're at it?
Valid.
> >
> >
> > Harald
Thanks at Harald for the review.

Thanks.

Usman.

Re: [PATCH v2] [Outreachy PATCH] t2030: modernize test path checks

[Srujith Poojary]

Hi Usman,

Thanks for the feedback!

Got it—I will remove the search command and update all four instances
of test -f in that file, and I'll make sure to use inline replies and
CC mentors going forward.

I'll send out the v3 patch shortly.

Thanks,
Srujith A Poojary

On Fri, Oct 16, 2026 at 3:06 PM Usman Akinyemi
<usmanakinyemi202@gmail.com> wrote:
>
> > Thanks for taking a look at my patch!
> > Since this is for an Outreachy microproject, I kept the scope small to
> > follow the guidelines. But I completely understand—if it helps, I can
> > take a look at modernizing some of the other ones too in a separate
> > patch.
> Firstly, do not toppost when replying to a message at Git. Use inline comments.
> While the guidelines talked about keeping the changes small, which is valid.
> But, that file has about four instances of the same "test -f", that is
> not a big change.
> You can change all of those instances.
>
> The main idea of Microproject is to get you familiar with the Git workflow.
> > >
> > > Seems like a good change, but there are lots of these calls in the
> > > codebase. Maybe change the others ones too, while you're at it?
> Valid.
> > >
> > >
> > > Harald
> Thanks at Harald for the review.
>
> Thanks.
>
> Usman.