t7614: avoid hiding git's exit code in a pipe

The exit code of the upstream command in a pipe is ignored, so in

	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual

a crash of "git cat-file" would go unnoticed: the exit code of the
pipeline is that of "sed", which happily succeeds on empty input. The
test would thus pass even though "git cat-file" failed.

Write the output of "git cat-file" to a file first and run "sed" on
that file, so that the exit codes of both commands are checked by the
&&-chain.

Signed-off-by: Shlok Kulshreshtha <diy2903@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Shlok Kulshreshtha 2026-07-15 17:03:44 +05:30 committed by Junio C Hamano
parent 55526a1826
commit b6b276974e
1 changed files with 6 additions and 3 deletions

View File

@ -45,7 +45,8 @@ test_expect_success 'git merge --signoff adds a sign-off line' '
test_commit main-branch-2 file2 2 &&
git checkout other-branch &&
git merge main --signoff --no-edit &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
git cat-file commit HEAD >commit &&
sed -e "1,/^\$/d" commit >actual &&
test_cmp expected-signed actual
'

@ -55,7 +56,8 @@ test_expect_success 'git merge does not add a sign-off line' '
test_commit main-branch-3 file3 3 &&
git checkout other-branch &&
git merge main --no-edit &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
git cat-file commit HEAD >commit &&
sed -e "1,/^\$/d" commit >actual &&
test_cmp expected-unsigned actual
'

@ -65,7 +67,8 @@ test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
test_commit main-branch-4 file4 4 &&
git checkout other-branch &&
git merge main --no-edit --signoff --no-signoff &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
git cat-file commit HEAD >commit &&
sed -e "1,/^\$/d" commit >actual &&
test_cmp expected-unsigned actual
'