diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:54 -0800 |
| commit | 54941a5316188f803a1adf669f1299e07132e041 (patch) | |
| tree | dfdcd4900df6fcc89357516c4bed7875e07718ee | |
| parent | 2509d0198ce3d38408c1fee2efabc9a861933122 (diff) | |
| parent | 4d81ce1b99b9e73e1f75fe4783ecff08a8ad736e (diff) | |
| download | git-54941a5316188f803a1adf669f1299e07132e041.tar.gz | |
Merge branch 'ab/t7600-avoid-losing-exit-status-of-git' into maint-2.39
Test fix.
* ab/t7600-avoid-losing-exit-status-of-git:
t7600: don't ignore "rev-parse" exit code in helper
| -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 } |