rebase-squashed branch fix-reference-delta-not-found

src-d · Apr 10, 2022 · b7346f9 · b7346f9
1 parent 8b0c211
commit b7346f9
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/plumbing/format/packfile/parser.go b/plumbing/format/packfile/parser.go
@@ -286,6 +286,18 @@ func (p *Parser) resolveDeltas() error {
 				if err := p.resolveObject(ioutil.Discard, child, content); err != nil {
 					return err
 				}
+
+				extRef, ok := p.oiByHash[child.SHA1]
+				if ok && extRef.ExternalRef {
+					// replace parent placeholder
+					p.oiByHash[child.SHA1] = child
+
+					// adopt children
+					child.Children = extRef.Children
+					for _, c := range child.Children {
+						c.Parent = child
+					}
+				}
 			}
 
 			// Remove the delta from the cache.