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/merge.c | |
| parent | Merge branch 'ma/bisect-leakfix' into maint (diff) | |
| parent | reduce_heads: fix memory leaks (diff) | |
| download | tgif-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/merge.c')
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ab5ffe85e8..fbbf2a9e5e 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -999,6 +999,7 @@ static struct commit_list *reduce_parents(struct commit *head_commit, /* Find what parents to record by checking independent ones. */ parents = reduce_heads(remoteheads); + free_commit_list(remoteheads); remoteheads = NULL; remotes = &remoteheads; |