diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-10-30 16:25:49 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-10-30 16:25:49 +0100 |
| commit | 1d37da3392276c16d49a3680e9bd6c22f2c3abd0 (patch) | |
| tree | 4b7d66a7bac726996588d25ec989a1c4bc3e3a04 /src/merge.c | |
| parent | 97d32abb492f7830f6e26719ce558429f6377b73 (diff) | |
| download | libgit2-1d37da3392276c16d49a3680e9bd6c22f2c3abd0.tar.gz | |
merge: any non-zero return from the user is an error
This fixes #1703.
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index b07e8c52f..a22801e48 100644 --- 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; } |