summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-15 03:14:32 (GMT)
commit905f16dd02bb15e0c1e12bf1a6c28510f504f441 (patch)
tree30ca8d7c2c929bf8bd57d4a853e4c92e74ae1ddb /builtin/fmt-merge-msg.c
parent093048b22913be23fe45635e8723d3aa3a185ff3 (diff)
parent4da72644b768b0491110a8ba0aa84d32b6bde41c (diff)
downloadgit-905f16dd02bb15e0c1e12bf1a6c28510f504f441.zip
git-905f16dd02bb15e0c1e12bf1a6c28510f504f441.tar.gz
git-905f16dd02bb15e0c1e12bf1a6c28510f504f441.tar.bz2
Merge branch 'ma/reduce-heads-leakfix'
Leak fixes. * ma/reduce-heads-leakfix: reduce_heads: fix memory leaks builtin/merge-base: free commit lists
Diffstat (limited to 'builtin/fmt-merge-msg.c')
-rw-r--r--builtin/fmt-merge-msg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index b69f7d3..22034f8 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -571,7 +571,7 @@ static void find_merge_parents(struct merge_parents *result,
head_commit = lookup_commit(head);
if (head_commit)
commit_list_insert(head_commit, &parents);
- parents = reduce_heads(parents);
+ reduce_heads_replace(&parents);
while (parents) {
struct commit *cmit = pop_commit(&parents);