undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7600: don't ignore "rev-parse" exit code in helper

Browse Source 
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>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-12-02 12:52:34 +01:00 committed by Junio C Hamano
parent e7e5c6f715
commit 4d81ce1b99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7600-merge.sh
View File

@ -105,7 +105,7 @@ verify_mergeheads () {
test_write_lines "$@" >mergehead.expected && test_write_lines "$@" >mergehead.expected &&
while read sha1 rest while read sha1 rest
do do
git rev-parse $sha1 git rev-parse $sha1 || return 1
done <.git/MERGE_HEAD >mergehead.actual && done <.git/MERGE_HEAD >mergehead.actual &&
test_cmp mergehead.expected mergehead.actual test_cmp mergehead.expected mergehead.actual
} }