diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:32 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:14:32 +0900 |
| commit | 905f16dd02bb15e0c1e12bf1a6c28510f504f441 (patch) | |
| tree | 30ca8d7c2c929bf8bd57d4a853e4c92e74ae1ddb /builtin/merge.c | |
| parent | 093048b22913be23fe45635e8723d3aa3a185ff3 (diff) | |
| parent | 4da72644b768b0491110a8ba0aa84d32b6bde41c (diff) | |
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/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 6071dbfe34..612dd7bfb6 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -998,6 +998,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; |