diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 6f73fc14a..f1778c950 100644 --- a/src/merge.c +++ b/src/merge.c @@ -287,8 +287,10 @@ int git_repository_mergehead_foreach( if ((error = git_oid_fromstr(&oid, line)) < 0) goto cleanup; - if ((error = GITERR_CALLBACK( cb(&oid, payload) )) != 0) + if ((error = cb(&oid, payload)) != 0) { + GITERR_CALLBACK(error); goto cleanup; + } ++line_num; } |