diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 06:14:32 +0300 |
| commit | 905f16dd02bb15e0c1e12bf1a6c28510f504f441 (patch) | |
| tree | 30ca8d7c2c929bf8bd57d4a853e4c92e74ae1ddb /builtin/pull.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/pull.c')
| -rw-r--r-- | builtin/pull.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index a28f0ffadd..f7e2c4f2ec 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -751,12 +751,15 @@ static int get_octopus_merge_base(struct object_id *merge_base, if (!is_null_oid(fork_point)) commit_list_insert(lookup_commit_reference(fork_point), &revs); - result = reduce_heads(get_octopus_merge_bases(revs)); + result = get_octopus_merge_bases(revs); free_commit_list(revs); + reduce_heads_replace(&result); + if (!result) return 1; oidcpy(merge_base, &result->item->object.oid); + free_commit_list(result); return 0; } |