From 814c4b374710c297e8538916814483b2098593c4 Mon Sep 17 00:00:00 2001 From: Rene Scharfe Date: Wed, 30 Aug 2017 19:49:50 +0200 Subject: [PATCH] merge: release strbuf after use in write_merge_heads() Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) 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) -- 2.11.0