summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2014-12-24 00:18:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-29 17:33:25 (GMT)
commit8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 (patch)
treebcdd30a4cdfc456de9a65be59b44c36a1dc05ab8 /builtin/merge.c
parentbbcefffcea9789e4a1a2023a1c778e2c07db77a7 (diff)
downloadgit-8d025b7cafdd976d1ba34fd8b2df8b669e1cd282.zip
git-8d025b7cafdd976d1ba34fd8b2df8b669e1cd282.tar.gz
git-8d025b7cafdd976d1ba34fd8b2df8b669e1cd282.tar.bz2
merge: release strbuf after use in suggest_conflicts()
Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 215d485..d722889 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -894,6 +894,7 @@ static int suggest_conflicts(void)
append_conflicts_hint(&msgbuf);
fputs(msgbuf.buf, fp);
+ strbuf_release(&msgbuf);
fclose(fp);
rerere(allow_rerere_auto);
printf(_("Automatic merge failed; "