summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-11-07 22:45:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-08 18:36:53 (GMT)
commit274a5c06d525da8c9720ae60454fba6779523c52 (patch)
treea7ad758e0777c7e7fa6486243b8b6edc2de129e1 /t/t7600-merge.sh
parentae8e4c9ce10ea9439a88b79a40aeff4696d40416 (diff)
downloadgit-274a5c06d525da8c9720ae60454fba6779523c52.zip
git-274a5c06d525da8c9720ae60454fba6779523c52.tar.gz
git-274a5c06d525da8c9720ae60454fba6779523c52.tar.bz2
merge: record tag objects without peeling in MERGE_HEAD
Otherwise, "git commit" wouldn't have a way to tell that we were in the middle of merging an annotated or signed tag, not a plain commit, after "git merge" stops to ask the user to resolve conflicts. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b91d022..5d8c428 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 () {