dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-07 08:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'sk/t7614-do-not-hide-git-exit-status'

Browse Source 
The test script 't/t7614-merge-signoff.sh' has been updated to avoid
suppressing the exit code of 'git' commands in a pipe.

* sk/t7614-do-not-hide-git-exit-status:
  t7614: avoid hiding git's exit code in a pipe
This commit is contained in:
Junio C Hamano
2026-07-22 10:30:54 -07:00
parent 2b8f09faec b6b276974e
commit af4899fbd3
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
t/t7614-merge-signoff.sh
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
'