Merge pull request #1199 from src-d/clean-up

*: code quality improvements

8 files changed, 12 insertions, 17 deletions

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()

 }

 

diff --git a/plumbing/format/commitgraph/file.go b/plumbing/format/commitgraph/file.go
index 175d279..1f82abd 100644
--- a/plumbing/format/commitgraph/file.go
+++ b/plumbing/format/commitgraph/file.go
@@ -249,7 +249,7 @@ func (fi *fileIndex) getHashesFromIndexes(indexes []int) ([]plumbing.Hash, error
 // Hashes returns all the hashes that are available in the index

 func (fi *fileIndex) Hashes() []plumbing.Hash {

 	hashes := make([]plumbing.Hash, fi.fanout[0xff])

-	for i := 0; i < int(fi.fanout[0xff]); i++ {

+	for i := 0; i < fi.fanout[0xff]; i++ {

 		offset := fi.oidLookupOffset + int64(i)*20

 		if n, err := fi.reader.ReadAt(hashes[i][:], offset); err != nil || n < 20 {

 			return nil

diff --git a/plumbing/format/commitgraph/memory.go b/plumbing/format/commitgraph/memory.go
index a4a96e9..f5afd4c 100644
--- a/plumbing/format/commitgraph/memory.go
+++ b/plumbing/format/commitgraph/memory.go
@@ -31,7 +31,7 @@ func (mi *MemoryIndex) GetIndexByHash(h plumbing.Hash) (int, error) {
 // GetCommitDataByIndex gets the commit node from the commit graph using index

 // obtained from child node, if available

 func (mi *MemoryIndex) GetCommitDataByIndex(i int) (*CommitData, error) {

-	if int(i) >= len(mi.commitData) {

+	if i >= len(mi.commitData) {

 		return nil, plumbing.ErrObjectNotFound

 	}

 

diff --git a/plumbing/format/diff/unified_encoder.go b/plumbing/format/diff/unified_encoder.go
index 8bd6d8a..169242d 100644
--- a/plumbing/format/diff/unified_encoder.go
+++ b/plumbing/format/diff/unified_encoder.go
@@ -94,7 +94,7 @@ func (e *UnifiedEncoder) printMessage(message string) {
 	isEmpty := message == ""
 	hasSuffix := strings.HasSuffix(message, "\n")
 	if !isEmpty && !hasSuffix {
-		message = message + "\n"
+		message += "\n"
 	}
 
 	e.buf.WriteString(message)
diff --git a/plumbing/format/gitattributes/pattern.go b/plumbing/format/gitattributes/pattern.go
index c5ca0c7..d961aba 100644
--- a/plumbing/format/gitattributes/pattern.go
+++ b/plumbing/format/gitattributes/pattern.go
@@ -66,7 +66,7 @@ func (p *pattern) Match(path []string) bool {
 			doublestar = true
 		}
 
-		switch true {
+		switch {
 		case strings.Contains(pattern[0], "**"):
 			return false
 
diff --git a/plumbing/format/idxfile/decoder.go b/plumbing/format/idxfile/decoder.go
index 5b92782..9e9c176 100644
--- a/plumbing/format/idxfile/decoder.go
+++ b/plumbing/format/idxfile/decoder.go
@@ -110,10 +110,6 @@ func readObjectNames(idx *MemoryIndex, r io.Reader) error {
 			continue
 		}
 
-		if buckets < 0 {
-			return ErrMalformedIdxFile
-		}
-
 		idx.FanoutMapping[k] = len(idx.Names)
 
 		nameLen := int(buckets * objectIDLength)
diff --git a/plumbing/format/idxfile/writer.go b/plumbing/format/idxfile/writer.go
index aa919e7..fcc78c5 100644
--- a/plumbing/format/idxfile/writer.go
+++ b/plumbing/format/idxfile/writer.go
@@ -147,7 +147,7 @@ func (w *Writer) createIndex() (*MemoryIndex, error) {
 		idx.Offset32[bucket] = append(idx.Offset32[bucket], buf.Bytes()...)
 
 		buf.Truncate(0)
-		binary.WriteUint32(buf, uint32(o.CRC32))
+		binary.WriteUint32(buf, o.CRC32)
 		idx.CRC32[bucket] = append(idx.CRC32[bucket], buf.Bytes()...)
 	}
 
diff --git a/plumbing/format/packfile/scanner_test.go b/plumbing/format/packfile/scanner_test.go
index a401d6d..3078477 100644
--- a/plumbing/format/packfile/scanner_test.go
+++ b/plumbing/format/packfile/scanner_test.go
@@ -140,6 +140,7 @@ func (s *ScannerSuite) TestReaderReset(c *C) {
 	p := NewScanner(r)
 
 	version, objects, err := p.Header()
+	c.Assert(err, IsNil)
 	c.Assert(version, Equals, VersionSupported)
 	c.Assert(objects, Equals, uint32(31))