diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 668ac2cd2..add7eab64 100644 --- a/src/merge.c +++ b/src/merge.c @@ -228,8 +228,11 @@ int git_merge__bases_many(git_commit_list **out, git_revwalk *walk, git_commit_l return -1; git_vector_foreach(twos, i, two) { - git_commit_list_parse(walk, two); + if (git_commit_list_parse(walk, two) < 0) + return -1; + two->flags |= PARENT2; + if (git_pqueue_insert(&list, two) < 0) return -1; } |