proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-28 19:23:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge: any non-zero return from the user is an error

Browse Source 
This fixes #1703.
This commit is contained in:
Carlos Martín Nieto 2013-10-30 16:25:49 +01:00
parent 97d32abb49
commit 1d37da3392
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/merge.c
View File

@ -285,7 +285,7 @@ int git_repository_mergehead_foreach(git_repository *repo,
if ((error = git_oid_fromstr(&oid, line)) < 0)
goto cleanup;
if (cb(&oid, payload) < 0) {
if (cb(&oid, payload) != 0) {
error = GIT_EUSER;
goto cleanup;
}