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>
Ævar Arnfjörð Bjarmason committed
Dec 2, 2022 at 12:52 UTC
4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e
1 file changed
+1
-1
t/t7600-merge.sh
+1
-1
@@ -105,7 +105,7 @@ verify_mergeheads () {
105
test_write_lines "$@" >mergehead.expected &&
106
while read sha1 rest
107
do
108
- git rev-parse $sha1
108
+ git rev-parse $sha1 || return 1
109
done <.git/MERGE_HEAD >mergehead.actual &&
110
test_cmp mergehead.expected mergehead.actual
111
}