Merge branch 'oid-parse-protection' into branch-iterator

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)
 	}