merge: release strbuf after use in write_merge_heads()

Signed-off-by: Rene Scharfe <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/builtin/merge.c b/builtin/merge.c
index 4f8418246be92732bbfdcd742b56a178d57119e2..7bc3fe4b6d1747f17320aa843db9d74546f243ad 100644 (file)
--- 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)