proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2026-01-04 21:21:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2532 from arthurschreiber/arthur/fix-merge-base-commit-check

Browse Source 
merge base: Correctly raise an error if a non-commit object is passed.
This commit is contained in:
Vicent Marti 2014-08-25 23:06:34 +02:00
commit 844d226c9d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/merge.c
View File

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