diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b91d022bc6f1886ead6780387da5a871c2e359ec..5d8c428543bd61a27489af72045b4e1816d240e9 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
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 () {