From af46dd50e9e0bea569449c4a70fc9217594cb2ba Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 21 Jul 2019 05:55:46 +0200 Subject: *: fixed tautological error conditionsautological error conditions - Added missing error handling around encodeCommitData and prevented shadowing err. - Removed tautological error checks. Signed-off-by: Christian Muehlhaeuser (cherry picked from commit 7d76176416551fc21d98bc17768d158a82281406) --- plumbing/format/commitgraph/encoder.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'plumbing/format/commitgraph/encoder.go') diff --git a/plumbing/format/commitgraph/encoder.go b/plumbing/format/commitgraph/encoder.go index a06871c..615e833 100644 --- a/plumbing/format/commitgraph/encoder.go +++ b/plumbing/format/commitgraph/encoder.go @@ -24,8 +24,6 @@ func NewEncoder(w io.Writer) *Encoder { // Encode writes an index into the commit-graph file func (e *Encoder) Encode(idx Index) error { - var err error - // Get all the hashes in the input index hashes := idx.Hashes() @@ -39,26 +37,26 @@ func (e *Encoder) Encode(idx Index) error { chunkSizes = append(chunkSizes, uint64(extraEdgesCount)*4) } - if err = e.encodeFileHeader(len(chunkSignatures)); err != nil { + if err := e.encodeFileHeader(len(chunkSignatures)); err != nil { return err } - if err = e.encodeChunkHeaders(chunkSignatures, chunkSizes); err != nil { + if err := e.encodeChunkHeaders(chunkSignatures, chunkSizes); err != nil { return err } - if err = e.encodeFanout(fanout); err != nil { + if err := e.encodeFanout(fanout); err != nil { return err } - if err = e.encodeOidLookup(hashes); err != nil { + if err := e.encodeOidLookup(hashes); err != nil { return err } if extraEdges, err := e.encodeCommitData(hashes, hashToIndex, idx); err == nil { if err = e.encodeExtraEdges(extraEdges); err != nil { return err } - } - if err != nil { + } else { return err } + return e.encodeChecksum() } -- cgit