reduce_heads: fix memory leaks

[thirdparty/git.git] / builtin / pull.c

diff --git a/builtin/pull.c b/builtin/pull.c
index 6f772e8a224c18238cf9a75436e8ea192765e7fe..4edab228ebe6c1d3df580689c7cf94eb989fe4bc 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -745,12 +745,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;
 }