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
This commit is contained in:
commit
54941a5316
@ -105,7 +105,7 @@ verify_mergeheads () {
|
||||
test_write_lines "$@" >mergehead.expected &&
|
||||
while read sha1 rest
|
||||
do
|
||||
git rev-parse $sha1
|
||||
git rev-parse $sha1 || return 1
|
||||
done <.git/MERGE_HEAD >mergehead.actual &&
|
||||
test_cmp mergehead.expected mergehead.actual
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user