diff options
| author | Rene Scharfe <l.s.r@web.de> | 2017-08-30 19:49:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-07 08:49:28 +0900 |
| commit | 814c4b374710c297e8538916814483b2098593c4 (patch) | |
| tree | ccc668ab4c80c50bd8900094070f5ea072d1c3ad | |
| parent | 150888e2733fa932949dad88af1b049193ef096f (diff) | |
| download | git-814c4b374710c297e8538916814483b2098593c4.tar.gz | |
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>
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 4f8418246b..7bc3fe4b6d 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) |