From: René Scharfe <l.s.r@web.de>
Date: Wed, 24 Dec 2014 00:18:38 +0000 (+0100)
Subject: merge: release strbuf after use in suggest_conflicts()
X-Git-Tag: v2.3.0-rc0~6^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8d025b7cafdd976d1ba34fd8b2df8b669e1cd282?ds=inline;hp=--cc

merge: release strbuf after use in suggest_conflicts()

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

8d025b7cafdd976d1ba34fd8b2df8b669e1cd282
diff --git a/builtin/merge.c b/builtin/merge.c
index 215d4856e5..d72288969f 100644
--- 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; "