From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 12 Jan 2015 19:38:32 +0000 (-0800)
Subject: Merge branch 'rs/plug-strbuf-leak-in-merge'
X-Git-Tag: v2.3.0-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d61e79050cd30231456740c3006aca94ed074db0?hp=-c

Merge branch 'rs/plug-strbuf-leak-in-merge'

* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()
---

d61e79050cd30231456740c3006aca94ed074db0
diff --combined builtin/merge.c
index 9effed7ff1,d72288969f..c638fd5a9a
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@@ -894,6 -894,7 +894,7 @@@ static int suggest_conflicts(void
  
  	append_conflicts_hint(&msgbuf);
  	fputs(msgbuf.buf, fp);
+ 	strbuf_release(&msgbuf);
  	fclose(fp);
  	rerere(allow_rerere_auto);
  	printf(_("Automatic merge failed; "
@@@ -1312,7 -1313,7 +1313,7 @@@ int cmd_merge(int argc, const char **ar
  	if (!remoteheads)
  		; /* already up-to-date */
  	else if (!remoteheads->next)
 -		common = get_merge_bases(head_commit, remoteheads->item, 1);
 +		common = get_merge_bases(head_commit, remoteheads->item);
  	else {
  		struct commit_list *list = remoteheads;
  		commit_list_insert(head_commit, &list);
@@@ -1409,7 -1410,7 +1410,7 @@@
  			 * merge_bases again, otherwise "git merge HEAD^
  			 * HEAD^^" would be missed.
  			 */
 -			common_one = get_merge_bases(head_commit, j->item, 1);
 +			common_one = get_merge_bases(head_commit, j->item);
  			if (hashcmp(common_one->item->object.sha1,
  				j->item->object.sha1)) {
  				up_to_date = 0;