mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ma/reduce-heads-leakfix'

Browse Source 
Leak fixes.

* ma/reduce-heads-leakfix:
  reduce_heads: fix memory leaks
  builtin/merge-base: free commit lists
This commit is contained in:
Junio C Hamano
2017-11-15 12:14:32 +09:00
parent 093048b229 4da72644b7
commit 905f16dd02
7 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/pull.c
View File

@ -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;
}