Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge: release strbuf after use in suggest_conflicts()
author
René Scharfe
<l.s.r@web.de>
Wed, 24 Dec 2014 00:18:38 +0000
(
01:18
+0100)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 29 Dec 2014 17:33:25 +0000
(09:33 -0800)
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>
builtin/merge.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
bbcefff
)
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 215d4856e507f671139f41c73b57e661d8d1bf87..d72288969f24b98a8712d32539b41b9548a4f5bb 100644
(file)
--- 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; "