summaryrefslogtreecommitdiff
path: root/walk.go
diff options
context:
space:
mode:
authorJesse Ezell <[email protected]>2014-04-04 00:50:41 -0700
committerJesse Ezell <[email protected]>2014-04-04 00:50:41 -0700
commitfc999289a2f4855dec72d52d360319362a2360a1 (patch)
treef65f3cce0db4003a35c50e4df297b9ae42622f60 /walk.go
parent39f59d921b7acc0bea40e1cadb7fb7bceabfbc6e (diff)
parent8982f4b3be90a04b0fad24da1ee6d85b1caad336 (diff)
Merge branch 'oid-parse-protection' into branch-iterator
Diffstat (limited to 'walk.go')
-rw-r--r--walk.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/walk.go b/walk.go
index f7c147d..9e07411 100644
--- a/walk.go
+++ b/walk.go
@@ -7,7 +7,6 @@ package git
import "C"
import (
- "io"
"runtime"
"unsafe"
)
@@ -158,8 +157,6 @@ func (v *RevWalk) Next(id *Oid) (err error) {
ret := C.git_revwalk_next(id.toC(), v.ptr)
switch {
- case ret == ITEROVER:
- err = io.EOF
case ret < 0:
err = MakeGitError(ret)
}
@@ -173,7 +170,7 @@ func (v *RevWalk) Iterate(fun RevWalkIterator) (err error) {
oid := new(Oid)
for {
err = v.Next(oid)
- if err == io.EOF {
+ if IsErrorCode(err, ErrIterOver) {
return nil
}
if err != nil {