From: Rene Scharfe Date: Wed, 30 Aug 2017 17:49:50 GMT Subject: [PATCH 19/34] merge: release strbuf after use in write_merge_heads() Message-ID: <20170830175005.20756-20-l.s.r@web.de> In-Reply-To: <20170830175005.20756-1-l.s.r@web.de> Signed-off-by: Rene Scharfe --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/merge.c b/builtin/merge.c index 4f8418246b..7bc3fe4b6d 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -920,24 +920,25 @@ static int setup_with_upstream(const char ***argv) static void write_merge_heads(struct commit_list *remoteheads) { struct commit_list *j; struct strbuf buf = STRBUF_INIT; for (j = remoteheads; j; j = j->next) { struct object_id *oid; struct commit *c = j->item; if (c->util && merge_remote_util(c)->obj) { oid = &merge_remote_util(c)->obj->oid; } else { oid = &c->object.oid; } strbuf_addf(&buf, "%s\n", oid_to_hex(oid)); } write_file_buf(git_path_merge_head(), buf.buf, buf.len); strbuf_reset(&buf); 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.14.1