diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 10:57:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 10:57:02 +0900 |
| commit | 80a0e0fdd6b51744a7c76583874e2993df645e47 (patch) | |
| tree | 3ca2a1e5a94ab89c59d7f3084c7339cd23dd312a /builtin/fmt-merge-msg.c | |
| parent | 03e8004f0674a704330519d07fa84957989e2686 (diff) | |
| parent | 4da72644b768b0491110a8ba0aa84d32b6bde41c (diff) | |
| download | git-80a0e0fdd6b51744a7c76583874e2993df645e47.tar.gz git-80a0e0fdd6b51744a7c76583874e2993df645e47.tar.xz | |
Merge branch 'ma/reduce-heads-leakfix' into maint
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index e99b5ddbf..27a2361e9 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); |