* [PATCH] t0100: avoid suppressing git exit code
@ 2026-01-13 18:04 amisha
2026-01-14 14:23 ` Pushkar Singh
0 siblings, 1 reply; 2+ messages in thread
From: amisha @ 2026-01-13 18:04 UTC (permalink / raw)
To: git; +Cc: amishhhaaaa
In t0100-previous.sh, the exit code of 'git cat-file' is suppressed by
piping it directly into grep. If git crashes, the test might not
notice.
Redirect the output of git to a temporary file 'actual' and grep
from that file instead. This ensures that the exit code of the
git command is properly checked.
Signed-off-by: amisha <amishhhaaaa@gmail.com>
---
t/t0100-previous.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
index dd5d9b4e5e..ffe3fda495 100755
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -40,7 +40,8 @@ test_expect_success 'merge @{-1}' '
git checkout other &&
git checkout main &&
git merge @{-1} &&
- git cat-file commit HEAD | grep "Merge branch '\''other'\''"
+ git cat-file commit HEAD >actual &&
+ grep "Merge branch '\''other'\''" actual
'
test_expect_success 'merge @{-1}~1' '
--
2.51.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] t0100: avoid suppressing git exit code
2026-01-13 18:04 [PATCH] t0100: avoid suppressing git exit code amisha
@ 2026-01-14 14:23 ` Pushkar Singh
0 siblings, 0 replies; 2+ messages in thread
From: Pushkar Singh @ 2026-01-14 14:23 UTC (permalink / raw)
To: amisha; +Cc: git
Hi Amisha,
Thanks for the patch. This makes sense, since piping into grep was indeed
suppressing the exit status of git cat-file.
One small style suggestion. Most Git tests use the helper instead of raw
grep, so this could be written as:
git cat-file commit HEAD >actual &&
test_grep "Merge branch 'other'" actual
This gives nicer diagnostics on failure and is consistent with other
tests.
Other than that, the approach looks good to me.
Thanks,
Pushkar
On Tue, Jan 13, 2026 at 11:34 PM amisha <amishhhaaaa@gmail.com> wrote:
>
> In t0100-previous.sh, the exit code of 'git cat-file' is suppressed by
> piping it directly into grep. If git crashes, the test might not
> notice.
>
> Redirect the output of git to a temporary file 'actual' and grep
> from that file instead. This ensures that the exit code of the
> git command is properly checked.
>
> Signed-off-by: amisha <amishhhaaaa@gmail.com>
> ---
> t/t0100-previous.sh | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
> index dd5d9b4e5e..ffe3fda495 100755
> --- a/t/t0100-previous.sh
> +++ b/t/t0100-previous.sh
> @@ -40,7 +40,8 @@ test_expect_success 'merge @{-1}' '
> git checkout other &&
> git checkout main &&
> git merge @{-1} &&
> - git cat-file commit HEAD | grep "Merge branch '\''other'\''"
> + git cat-file commit HEAD >actual &&
> + grep "Merge branch '\''other'\''" actual
> '
>
> test_expect_success 'merge @{-1}~1' '
> --
> 2.51.0
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-01-14 14:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-13 18:04 [PATCH] t0100: avoid suppressing git exit code amisha
2026-01-14 14:23 ` Pushkar Singh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox