[PATCH v3 1/8] merge tests: don't ignore "rev-parse" exit code in helper
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 2, 2022, 11:52 UTC
- Message-ID
- <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>
- In-Reply-To
- <cover-v3-0.8-00000000000-20221202T114733Z-avarab@gmail.com>
Change the verify_mergeheads() helper the check the exit code of "git rev-parse".
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- t/t7600-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 7c3f6ed9943..060e145957f 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 }
-- 2.39.0.rc1.981.gf846af54b4b