mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'rs/pull-leakfix'
Leakfix. * rs/pull-leakfix: pull: plug minor memory leak after using is_descendant_of()
This commit is contained in:
commit
b381c98891
|
@ -1031,6 +1031,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
|
|||
ran_ff = 1;
|
||||
ret = run_merge();
|
||||
}
|
||||
free_commit_list(list);
|
||||
}
|
||||
if (!ran_ff)
|
||||
ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
|
||||
|
|
Loading…
Reference in a new issue