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

plumbing: format/packfile, fix panic retrieving object hash. #744

Merged
merged 2 commits into from
Feb 13, 2018
Merged

plumbing: format/packfile, fix panic retrieving object hash. #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2273d2
plumbing: format/packfile, fix panic retrieving object hash.
jfontan Feb 9, 2018
37c7c2b
plumbing: format/packfile, add SaveOriginalMetadata function
jfontan Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions plumbing/format/packfile/delta_selector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (dw *deltaSelector) objectsToPack(

otp := newObjectToPack(o)
if _, ok := o.(plumbing.DeltaObject); ok {
otp.Original = nil
otp.CleanOriginal()
}

objectsToPack = append(objectsToPack, otp)
Expand Down Expand Up @@ -231,7 +231,8 @@ func (dw *deltaSelector) walk(
delete(indexMap, obj.Hash())

if obj.IsDelta() {
obj.Original = nil
obj.SaveOriginalMetadata()
obj.CleanOriginal()
}
}

Expand Down
4 changes: 2 additions & 2 deletions plumbing/format/packfile/encoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@ func (s *EncoderSuite) deltaOverDeltaCyclicTest(c *C) {
// is nil.
po1.SetOriginal(po1.Original)
pd2.SetOriginal(pd2.Original)
pd2.SetOriginal(nil)
pd2.CleanOriginal()

pd3.SetOriginal(pd3.Original)
pd3.SetOriginal(nil)
pd3.CleanOriginal()

pd4.SetOriginal(pd4.Original)

Expand Down
17 changes: 13 additions & 4 deletions plumbing/format/packfile/object_pack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,24 @@ func (o *ObjectToPack) WantWrite() bool {
// is nil Original is set but previous resolved values are kept
func (o *ObjectToPack) SetOriginal(obj plumbing.EncodedObject) {
o.Original = obj
o.SaveOriginalMetadata()
}

if obj != nil {
o.originalSize = obj.Size()
o.originalType = obj.Type()
o.originalHash = obj.Hash()
// SaveOriginalMetadata saves size, type and hash of Original object
func (o *ObjectToPack) SaveOriginalMetadata() {
if o.Original != nil {
o.originalSize = o.Original.Size()
o.originalType = o.Original.Type()
o.originalHash = o.Original.Hash()
o.resolvedOriginal = true
}
}

// CleanOriginal sets Original to nil
func (o *ObjectToPack) CleanOriginal() {
o.Original = nil
}

func (o *ObjectToPack) Type() plumbing.ObjectType {
if o.Original != nil {
return o.Original.Type()
Expand Down