Add one more cache check to the iterator

Signed-off-by: Filip Navara <[email protected]>

Author: filipnavara

plumbing/format/packfile/packfile.go

@@ -490,21 +490,31 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {
 					continue
 				}
 			} else {
+				if obj, ok := i.p.cacheGet(e.Hash); ok {
+					if obj.Type() != i.typ {
+						continue
+					}
+					return obj, nil
+				}
+
 				h, err := i.p.objectHeaderAtOffset(int64(e.Offset))
 				if err != nil {
 					return nil, err
 				}
 
 				typ, err := i.p.getObjectType(h)
-				if err == nil && typ != i.typ {
+				if err != nil {
+					return nil, err
+				}
+				if typ != i.typ {
 					continue
 				}
 
 				return i.p.getNextObject(h, e.Hash)
 			}
 		}
 
-		obj, err := i.p.GetByOffset(int64(e.Offset))
+		obj, err := i.p.objectAtOffset(int64(e.Offset), e.Hash)
 		if err != nil {
 			return nil, err
 		}