From 274a5c06d525da8c9720ae60454fba6779523c52 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 7 Nov 2011 14:45:10 -0800 Subject: 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 --- t/t7600-merge.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 't') 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 () { -- cgit v1.2.3