diff options
| author | Russell Belfer <rb@github.com> | 2013-12-06 15:42:20 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2013-12-11 10:57:50 -0800 |
| commit | c7b3e1b32040d05f3cb996d754a28af3b4d06d0b (patch) | |
| tree | c2cb268aeb8b8dc244970034d1d220867c6ed62b /src/merge.c | |
| parent | 60058018dcadbaa1f70281c9d29faf1e46d3a87c (diff) | |
| download | libgit2-c7b3e1b32040d05f3cb996d754a28af3b4d06d0b.tar.gz | |
Some callback error check style cleanups
I find this easier to read...
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; } |