diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-19 11:46:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-19 11:46:13 +0900 |
| commit | 4eec47c1cd8d10a53da0c5ea1d627e232641df7c (patch) | |
| tree | 26c00ed83124b010533435d88f3d7322c8261e48 | |
| parent | Merge branch 'ab/t5314-avoid-losing-exit-status' (diff) | |
| parent | t7600: don't ignore "rev-parse" exit code in helper (diff) | |
| download | git-4eec47c1cd8d10a53da0c5ea1d627e232641df7c.tar.gz git-4eec47c1cd8d10a53da0c5ea1d627e232641df7c.zip | |
Merge branch 'ab/t7600-avoid-losing-exit-status-of-git'
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 } |