From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Fri, 2 Dec 2022 11:52:34 +0000 (+0100)
Subject: t7600: don't ignore "rev-parse" exit code in helper
X-Git-Tag: v2.40.0-rc0~147^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e;p=thirdparty%2Fgit.git

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>
---

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 7c3f6ed994..060e145957 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -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
 }