diff options
author | Vicent Marti <tanoku@gmail.com> | 2012-08-06 12:41:08 +0200 |
---|---|---|
committer | Vicent Marti <tanoku@gmail.com> | 2012-08-06 12:41:08 +0200 |
commit | 51e1d8084641bd36416bf6f127b31d47d64cce69 (patch) | |
tree | 1a95e6b4c664020eb4bbff843eead794f3ee3d35 /src/attr.c | |
parent | 7e9f78b5fee2d8f56711a587c35fcba10d370547 (diff) | |
parent | b0d376695e7d3f71fed97d9d08b60661faad7a5a (diff) | |
download | libgit2-51e1d8084641bd36416bf6f127b31d47d64cce69.tar.gz |
Merge remote-tracking branch 'arrbee/tree-walk-fixes' into development
Conflicts:
src/notes.c
src/transports/git.c
src/transports/http.c
src/transports/local.c
tests-clar/odb/foreach.c
Diffstat (limited to 'src/attr.c')
-rw-r--r-- | src/attr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/attr.c b/src/attr.c index c0d7ddd04..a6a87afee 100644 --- a/src/attr.c +++ b/src/attr.c @@ -182,11 +182,14 @@ int git_attr_foreach( continue; git_strmap_insert(seen, assign->name, assign, error); - if (error >= 0) - error = callback(assign->name, assign->value, payload); + if (error < 0) + goto cleanup; - if (error != 0) + error = callback(assign->name, assign->value, payload); + if (error) { + error = GIT_EUSER; goto cleanup; + } } } } |