diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2016-09-09 16:50:35 +0200 |
---|---|---|
committer | Máximo Cuadros <mcuadros@gmail.com> | 2016-09-09 16:50:35 +0200 |
commit | f09fb50cb092c241df4c0bd25c6755e6132e473e (patch) | |
tree | c67f4cdeacf70a64d00167cceceed7a68a5c9e4a /storage/filesystem/storage.go | |
parent | 59219f01bbf5f748876258fe5f4648d2cfd4d6e9 (diff) | |
download | go-git-f09fb50cb092c241df4c0bd25c6755e6132e473e.tar.gz |
storage: filessytem read multiple packfiles support and index decoding
Diffstat (limited to 'storage/filesystem/storage.go')
-rw-r--r-- | storage/filesystem/storage.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index b0eaf6f..d39d6e4 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -18,17 +18,17 @@ type Storage struct { } func NewStorage(fs fs.Filesystem) (*Storage, error) { - return &Storage{dir: dotgit.New(fs), fs: fs}, nil + dir := dotgit.New(fs) + o, err := newObjectStorage(dir) + if err != nil { + return nil, err + } + + return &Storage{dir: dir, fs: fs, o: o}, nil } func (s *Storage) ObjectStorage() core.ObjectStorage { - if s.o != nil { - return s.o - } - - //TODO: error being ignored - i, _ := buildIndex(s.fs, s.dir) - return &ObjectStorage{dir: s.dir, index: i} + return s.o } func (s *Storage) ReferenceStorage() core.ReferenceStorage { |