Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
shortlog: release strbuf after use in insert_one_record()
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 4f8418246be92732bbfdcd742b56a178d57119e2..7bc3fe4b6d1747f17320aa843db9d74546f243ad 100644
(file)
--- 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)