Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit 37c7c2b

Browse files
committed
plumbing: format/packfile, add SaveOriginalMetadata function
Signed-off-by: Javi Fontan <jfontan@gmail.com>
1 parent d2273d2 commit 37c7c2b

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

plumbing/format/packfile/delta_selector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func (dw *deltaSelector) walk(
231231
delete(indexMap, obj.Hash())
232232

233233
if obj.IsDelta() {
234-
obj.SetOriginal(obj.Original)
234+
obj.SaveOriginalMetadata()
235235
obj.CleanOriginal()
236236
}
237237
}

plumbing/format/packfile/object_pack.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,15 @@ func (o *ObjectToPack) WantWrite() bool {
8181
// is nil Original is set but previous resolved values are kept
8282
func (o *ObjectToPack) SetOriginal(obj plumbing.EncodedObject) {
8383
o.Original = obj
84+
o.SaveOriginalMetadata()
85+
}
8486

85-
if obj != nil {
86-
o.originalSize = obj.Size()
87-
o.originalType = obj.Type()
88-
o.originalHash = obj.Hash()
87+
// SaveOriginalMetadata saves size, type and hash of Original object
88+
func (o *ObjectToPack) SaveOriginalMetadata() {
89+
if o.Original != nil {
90+
o.originalSize = o.Original.Size()
91+
o.originalType = o.Original.Type()
92+
o.originalHash = o.Original.Hash()
8993
o.resolvedOriginal = true
9094
}
9195
}

0 commit comments

Comments
 (0)