Merge pull request argoproj-labs#7 from rohankmr414/ref-delta

plumbing: resolve non-external delta references
weafscast · Jan 14, 2023 · 75279d8 · 75279d8
2 parents 3ac2073 + 28afdf1
commit 75279d8
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/plumbing/format/packfile/parser.go b/plumbing/format/packfile/parser.go
@@ -234,6 +234,15 @@ func (p *Parser) indexObjects() error {
 				return err
 			}
 
+			// move children of placeholder parent into actual parent in case this was
+			// a non-external delta reference
+			if placeholder, ok := p.oiByHash[sha1]; ok {
+				ota.Children = placeholder.Children
+				for _, c := range ota.Children {
+					c.Parent = ota
+				}
+			}
+
 			ota.SHA1 = sha1
 			p.oiByHash[ota.SHA1] = ota
 		}