Commit ab4bcc03 by Ben Straub

Plug a small memory leak

parent e82b6d13
......@@ -753,8 +753,11 @@ static int checkout_conflicts_load(checkout_data *data, git_iterator *workdir, g
conflict->theirs = theirs;
if ((error = checkout_conflict_detect_submodule(conflict)) < 0 ||
(error = checkout_conflict_detect_binary(data->repo, conflict)) < 0)
(error = checkout_conflict_detect_binary(data->repo, conflict)) < 0)
{
git__free(conflict);
goto done;
}
git_vector_insert(&data->conflicts, conflict);
}
......
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