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

gitster · gitster · commit d61e79050cd3 · 2015-01-12T11:38:37.000-08:00
* rs/plug-strbuf-leak-in-merge:
  merge: release strbuf after use in suggest_conflicts()
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -894,6 +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; "
