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

filipnavara · filipnavara · commit f25873b7e90f · 2019-04-24T09:42:53.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
@@ -493,12 +493,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
`@@ -493,12 +493,14 @@ func (i *objectIter) Next() (plumbing.EncodedObject, error) {`
`493`	`493`	`return nil, err`
`494`	`494`	`}`
`495`	`495`	`if typ != i.typ {`
	`496`	`+ i.p.offsetToType[int64(e.Offset)] = typ`
`496`	`497`	`continue`
`497`	`498`	`}`
`498`	`499`	`// getObjectType will seek in the file so we cannot use getNextObject safely`
`499`	`500`	`return i.p.objectAtOffset(int64(e.Offset), e.Hash)`
`500`	`501`	`} else {`
`501`	`502`	`if h.Type != i.typ {`
	`503`	`+ i.p.offsetToType[int64(e.Offset)] = h.Type`
`502`	`504`	`continue`
`503`	`505`	`}`
`504`	`506`	`return i.p.getNextObject(h, e.Hash)`