From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Oct 2011 17:49:26 +0000 (-0700)
Subject: Merge branch 'nd/maint-autofix-tag-in-head' into maint
X-Git-Tag: v1.7.7.1~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d25a265220f7e9a50693d0ec4bb05c7be0539d69;p=git.git

Merge branch 'nd/maint-autofix-tag-in-head' into maint

* nd/maint-autofix-tag-in-head:
  Accept tags in HEAD or MERGE_HEAD
  merge: remove global variable head[]
  merge: use return value of resolve_ref() to determine if HEAD is invalid
  merge: keep stash[] a local variable

Conflicts:
	builtin/merge.c
---

d25a265220f7e9a50693d0ec4bb05c7be0539d69
diff --cc builtin/merge.c
index ab4077f27,9567d60ba..581f494ae
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -901,8 -905,8 +903,8 @@@ static int finish_automerge(struct comm
  	strbuf_addch(&merge_msg, '\n');
  	run_prepare_commit_msg();
  	commit_tree(merge_msg.buf, result_tree, parents, result_commit, NULL);
 -	strbuf_addf(&buf, "Merge made by %s.", wt_strategy);
 +	strbuf_addf(&buf, "Merge made by the '%s' strategy.", wt_strategy);
- 	finish(result_commit, buf.buf);
+ 	finish(head, result_commit, buf.buf);
  	strbuf_release(&buf);
  	drop_save();
  	return 0;