Populate the offsetToType cache in the iterator even for the skipped objects

filipnavara · filipnavara · commit 78bab69f9cb3 · 2019-04-24T09:43:37.000+02:00
Signed-off-by: Filip Navara &lt;navara@emclient.com&gt;
diff --git a/plumbing/format/packfile/packfile.go b/plumbing/format/packfile/packfile.go
@@ -478,6 +478,7 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {
 				}
 			} else if obj, ok := i.p.cacheGet(e.Hash); ok {
 				if obj.Type() != i.typ {
+					i.p.offsetToType[int64(e.Offset)] = obj.Type()
 					continue
 				}
 				return obj, nil
@@ -493,12 +494,14 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {
 						return nil, err
 					}
 					if typ != i.typ {
+						i.p.offsetToType[int64(e.Offset)] = typ
 						continue
 					}
 					// getObjectType will seek in the file so we cannot use getNextObject safely
 					return i.p.objectAtOffset(int64(e.Offset), e.Hash)
 				} else {
 					if h.Type != i.typ {
+						i.p.offsetToType[int64(e.Offset)] = h.Type
 						continue
 					}
 					return i.p.getNextObject(h, e.Hash)

Original file line number	Diff line number	Diff line change
`@@ -478,6 +478,7 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {`
`478`	`478`	`}`
`479`	`479`	`} else if obj, ok := i.p.cacheGet(e.Hash); ok {`
`480`	`480`	`if obj.Type() != i.typ {`
	`481`	`+ i.p.offsetToType[int64(e.Offset)] = obj.Type()`
`481`	`482`	`continue`
`482`	`483`	`}`
`483`	`484`	`return obj, nil`
`@@ -493,12 +494,14 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {`
`493`	`494`	`return nil, err`
`494`	`495`	`}`
`495`	`496`	`if typ != i.typ {`
	`497`	`+ i.p.offsetToType[int64(e.Offset)] = typ`
`496`	`498`	`continue`
`497`	`499`	`}`
`498`	`500`	`// getObjectType will seek in the file so we cannot use getNextObject safely`
`499`	`501`	`return i.p.objectAtOffset(int64(e.Offset), e.Hash)`
`500`	`502`	`} else {`
`501`	`503`	`if h.Type != i.typ {`
	`504`	`+ i.p.offsetToType[int64(e.Offset)] = h.Type`
`502`	`505`	`continue`
`503`	`506`	`}`
`504`	`507`	`return i.p.getNextObject(h, e.Hash)`