diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b91d022bc6..5d8c428543 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -96,7 +96,11 @@ verify_parents () { verify_mergeheads () { printf '%s\n' "$@" >mergehead.expected && - test_cmp mergehead.expected .git/MERGE_HEAD + while read sha1 rest + do + git rev-parse $sha1 + done <.git/MERGE_HEAD >mergehead.actual && + test_cmp mergehead.expected mergehead.actual } verify_no_mergehead () { |