summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVicent Marti <tanoku@gmail.com>2011-06-24 15:30:10 +0200
committerVicent Marti <tanoku@gmail.com>2011-06-24 15:30:10 +0200
commitce90d81f6fde73303817086041c0a24a813abff3 (patch)
treef120ccf2d236853ae440562dcbcf3309b2a78cdf
parent8172dd4383c81bb8648b31cca09acea2143640da (diff)
downloadlibgit2-ce90d81f6fde73303817086041c0a24a813abff3.tar.gz
revwalk: Do not set error string on revwalk over
-rw-r--r--src/revwalk.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/revwalk.c b/src/revwalk.c
index 515279619..cdad83f91 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -546,12 +546,15 @@ int git_revwalk_next(git_oid *oid, git_revwalk *walk)
}
error = walk->get_next(&next, walk);
- if (error < GIT_SUCCESS) {
- if (error == GIT_EREVWALKOVER)
- git_revwalk_reset(walk);
- return git__rethrow(error, "Failed to load next revision");
+
+ if (error == GIT_EREVWALKOVER) {
+ git_revwalk_reset(walk);
+ return GIT_EREVWALKOVER;
}
+ if (error < GIT_SUCCESS)
+ return git__rethrow(error, "Failed to load next revision");
+
git_oid_cpy(oid, &next->oid);
return GIT_SUCCESS;
}