diff options
author | Miguel Molina <miguel@erizocosmi.co> | 2018-07-27 15:36:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-27 15:36:04 +0200 |
commit | 0ade8fb60e759da42f8779b2a5c8a3f422ce4d69 (patch) | |
tree | 85d416c7ab1393be6a00ca8b3851e3ff8dc3e67e /plumbing/format/idxfile/idxfile.go | |
parent | b7131019e6b2639f69623029a5a1f178bc920a4e (diff) | |
parent | ccd0fa0bc17f0680038529b00f5c5a44f8e77b41 (diff) | |
download | go-git-0ade8fb60e759da42f8779b2a5c8a3f422ce4d69.tar.gz |
Merge pull request #899 from erizocosmico/feature/new-packfile
plumbing: packfile, new Packfile representation
Diffstat (limited to 'plumbing/format/idxfile/idxfile.go')
-rw-r--r-- | plumbing/format/idxfile/idxfile.go | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/plumbing/format/idxfile/idxfile.go b/plumbing/format/idxfile/idxfile.go index f57df2e..d4a9365 100644 --- a/plumbing/format/idxfile/idxfile.go +++ b/plumbing/format/idxfile/idxfile.go @@ -157,9 +157,8 @@ func (idx *MemoryIndex) getCrc32(firstLevel, secondLevel int) (uint32, error) { func (idx *MemoryIndex) FindHash(o int64) (plumbing.Hash, error) { // Lazily generate the reverse offset/hash map if required. if idx.offsetHash == nil { - err := idx.genOffsetHash() - if err != nil { - return plumbing.ZeroHash, nil + if err := idx.genOffsetHash(); err != nil { + return plumbing.ZeroHash, err } } @@ -185,19 +184,17 @@ func (idx *MemoryIndex) genOffsetHash() error { return err } - var entry *Entry - for err != nil { - entry, err = iter.Next() - if err == nil { - idx.offsetHash[int64(entry.Offset)] = entry.Hash + for { + entry, err := iter.Next() + if err != nil { + if err == io.EOF { + return nil + } + return err } - } - if err == io.EOF { - return nil + idx.offsetHash[int64(entry.Offset)] = entry.Hash } - - return err } // Count implements the Index interface. |