Plug a small memory leak

This commit is contained in:
Ben Straub 2014-01-22 14:14:37 -08:00
parent e82b6d13d2
commit ab4bcc038a

View File

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