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

Commit 4cb21e2

Browse files
committed
Fix build after rebase.
Signed-off-by: Filip Navara <[email protected]>
1 parent dd7c3e2 commit 4cb21e2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

storage/filesystem/object.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ func (s *ObjectStorage) encodedObjectSizeFromPackfile(h plumbing.Hash) (
207207
idx := s.index[pack]
208208
hash, err := idx.FindHash(offset)
209209
if err == nil {
210-
obj, ok := s.deltaBaseCache.Get(hash)
210+
obj, ok := s.objectCache.Get(hash)
211211
if ok {
212212
return obj.Size(), nil
213213
}
@@ -216,8 +216,8 @@ func (s *ObjectStorage) encodedObjectSizeFromPackfile(h plumbing.Hash) (
216216
}
217217

218218
var p *packfile.Packfile
219-
if s.deltaBaseCache != nil {
220-
p = packfile.NewPackfileWithCache(idx, s.dir.Fs(), f, s.deltaBaseCache)
219+
if s.objectCache != nil {
220+
p = packfile.NewPackfileWithCache(idx, s.dir.Fs(), f, s.objectCache)
221221
} else {
222222
p = packfile.NewPackfile(idx, s.dir.Fs(), f)
223223
}
@@ -342,7 +342,7 @@ func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedOb
342342
return nil, err
343343
}
344344

345-
s.objectCache.Put(obj);
345+
s.objectCache.Put(obj)
346346

347347
_, err = io.Copy(w, r)
348348
return obj, err
@@ -417,7 +417,7 @@ func (s *ObjectStorage) decodeDeltaObjectAt(
417417
}
418418

419419
p := packfile.NewScanner(f)
420-
header, err := p.SeekObjectHeader(offset);
420+
header, err := p.SeekObjectHeader(offset)
421421
if err != nil {
422422
return nil, err
423423
}

0 commit comments

Comments
 (0)