mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
t7600: don't ignore "rev-parse" exit code in helper
Change the verify_mergeheads() helper the check the exit code of "git rev-parse". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e7e5c6f715
commit
4d81ce1b99
|
@ -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 a new issue