diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-12-02 12:52:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-05 01:27:32 +0100 |
| commit | 4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e (patch) | |
| tree | c5f68947727da22bca25af5f193795bac38323b9 /t/t7600-merge.sh | |
| parent | Downmerge a bit more for 2.38.2 (diff) | |
| download | git-4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e.tar.xz git-4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e.zip | |
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>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |