From b872b71112ed4034bbd9c33a0babd6353b582429 Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Tue, 7 Feb 2017 16:02:46 +0100 Subject: Fix missing objects if they where deltified using ref-delta - Deleted invalid logic that returned nil if an ref-delta was not found into the decoder index. This logic was missing objects if it was deltified using ref-deltas. - Now, to avoid that problem, index is mandatory to decode correctly a packfile of a specific type. Decoder.SetOffsets method now is called into the EncodedObjectIterator to avoid this problem. --- storage/filesystem/object.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'storage/filesystem/object.go') diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 2975c1e..904f6fe 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -233,7 +233,7 @@ func (s *ObjectStorage) buildPackfileIters( return nil, err } - iter, err := newPackfileIter(pack, t, seen) + iter, err := newPackfileIter(pack, t, seen, s.index[h]) if err != nil { return nil, err } @@ -272,10 +272,11 @@ type packfileIter struct { } func NewPackfileIter(f billy.File, t plumbing.ObjectType) (storer.EncodedObjectIter, error) { - return newPackfileIter(f, t, make(map[plumbing.Hash]bool)) + return newPackfileIter(f, t, make(map[plumbing.Hash]bool), nil) } -func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash]bool) (storer.EncodedObjectIter, error) { +func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash]bool, + index idx) (storer.EncodedObjectIter, error) { s := packfile.NewScanner(f) _, total, err := s.Header() if err != nil { @@ -287,6 +288,8 @@ func newPackfileIter(f billy.File, t plumbing.ObjectType, seen map[plumbing.Hash return nil, err } + d.SetOffsets(index) + return &packfileIter{ f: f, d: d, -- cgit