diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-01-30 19:12:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 19:12:31 +0100 |
| commit | a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2 (patch) | |
| tree | 5af72223dcc5ff071016e16cba0967f3fa1d0293 /storage/filesystem/object.go | |
| parent | 434611b74cb54538088c6aeed4ed27d3044064fa (diff) | |
| parent | 51b01ef90c03c2f83126eb339723d7b7e7a6a245 (diff) | |
| download | go-git-a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2.tar.gz | |
Merge pull request #1056 from jfontan/fix/lose-objects-shared-cachev4.9.1
storage/filesystem: check file object before using cache
Diffstat (limited to 'storage/filesystem/object.go')
| -rw-r--r-- | storage/filesystem/object.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index 85bb798..3eb62a2 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -307,10 +307,6 @@ func (s *ObjectStorage) DeltaObject(t plumbing.ObjectType, } func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedObject, err error) { - if cacheObj, found := s.objectCache.Get(h); found { - return cacheObj, nil - } - f, err := s.dir.Object(h) if err != nil { if os.IsNotExist(err) { @@ -319,9 +315,12 @@ func (s *ObjectStorage) getFromUnpacked(h plumbing.Hash) (obj plumbing.EncodedOb return nil, err } - defer ioutil.CheckClose(f, &err) + if cacheObj, found := s.objectCache.Get(h); found { + return cacheObj, nil + } + obj = s.NewEncodedObject() r, err := objfile.NewReader(f) if err != nil { |