summaryrefslogtreecommitdiff
path: root/index.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2014-04-26 20:24:11 +0200
committerCarlos Martín Nieto <[email protected]>2014-04-26 20:24:11 +0200
commit3cf0b6db80885c63986001f3217019bdf2295b71 (patch)
treeab57488aea30266d689924ea23705a305a05103c /index.go
parentdca2192492a63df11365e3fecd03281e174cb788 (diff)
parent8982f4b3be90a04b0fad24da1ee6d85b1caad336 (diff)
Merge pull request #80 from jezell/oid-parse-protection
make it possible to handle errors
Diffstat (limited to 'index.go')
-rw-r--r--index.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/index.go b/index.go
index d3178a2..f20dc31 100644
--- a/index.go
+++ b/index.go
@@ -266,10 +266,6 @@ func (v *IndexConflictIterator) Next() (IndexConflict, error) {
defer runtime.UnlockOSThread()
ecode := C.git_index_conflict_next(&cancestor, &cour, &ctheir, v.ptr)
- if ecode == C.GIT_ITEROVER {
- return IndexConflict{}, ErrIterOver
- }
-
if ecode < 0 {
return IndexConflict{}, MakeGitError(ecode)
}