Skip to content

Commit 54941a5

Browse files
committed
Merge branch 'ab/t7600-avoid-losing-exit-status-of-git' into maint-2.39
Test fix. * ab/t7600-avoid-losing-exit-status-of-git: t7600: don't ignore "rev-parse" exit code in helper
2 parents 2509d01 + 4d81ce1 commit 54941a5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/t7600-merge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ verify_mergeheads () {
105105
test_write_lines "$@" >mergehead.expected &&
106106
while read sha1 rest
107107
do
108-
git rev-parse $sha1
108+
git rev-parse $sha1 || return 1
109109
done <.git/MERGE_HEAD >mergehead.actual &&
110110
test_cmp mergehead.expected mergehead.actual
111111
}

0 commit comments

Comments
 (0)