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

This fixes #1703.

merge: any non-zero return from the user is an error
This fixes #1703.
1d37da33 · Carlos Martín Nieto · 97d32abb · 1d37da33
Commit 1d37da33 authored Oct 30, 2013 by Carlos Martín Nieto
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/merge.c
+1 -1

No files found.
--- a/src/merge.c
+++ b/src/merge.c
@@ -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;
 		}