From: Rene Scharfe <l.s.r@web.de>
Date: Wed, 30 Aug 2017 17:49:50 +0000 (+0200)
Subject: merge: release strbuf after use in write_merge_heads()
X-Git-Tag: v2.15.0-rc0~78^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=814c4b374710c297e8538916814483b2098593c4;p=git-core%2Fgit.git

merge: release strbuf after use in write_merge_heads()

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

diff --git a/builtin/merge.c b/builtin/merge.c
index 4f8418246..7bc3fe4b6 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -938,6 +938,7 @@ static void write_merge_heads(struct commit_list *remoteheads)
 	if (fast_forward == FF_NO)
 		strbuf_addstr(&buf, "no-ff");
 	write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
+	strbuf_release(&buf);
 }
 
 static void write_merge_state(struct commit_list *remoteheads)