Commit fac42ff9 by Patrick Steinhardt

merge: fix memory leak

parent 0f814deb
......@@ -1985,9 +1985,6 @@ static int create_virtual_base(
git_index *index = NULL;
git_merge_options virtual_opts = GIT_MERGE_OPTIONS_INIT;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
/* Conflicts in the merge base creation do not propagate to conflicts
* in the result; the conflicted base will act as the common ancestor.
*/
......@@ -2001,6 +1998,8 @@ static int create_virtual_base(
recursion_level + 1, &virtual_opts)) < 0)
return -1;
result = git__calloc(1, sizeof(git_annotated_commit));
GITERR_CHECK_ALLOC(result);
result->type = GIT_ANNOTATED_COMMIT_VIRTUAL;
result->index = index;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment