diff options
| author | Christian Muehlhaeuser <muesli@gmail.com> | 2019-07-21 05:55:46 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2019-07-29 17:31:40 +0200 |
| commit | af46dd50e9e0bea569449c4a70fc9217594cb2ba (patch) | |
| tree | cf18ed6487f76a450bb89bde0f9028edec8beee8 /plumbing | |
| parent | d3c45dc2f0898d5a5bd48860eb74005faa6c8ec5 (diff) | |
| download | go-git-af46dd50e9e0bea569449c4a70fc9217594cb2ba.tar.gz | |
*: 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 <muesli@gmail.com>
(cherry picked from commit 7d76176416551fc21d98bc17768d158a82281406)
Diffstat (limited to 'plumbing')
| -rw-r--r-- | plumbing/format/commitgraph/encoder.go | 14 | ||||
| -rw-r--r-- | plumbing/transport/server/server.go | 5 |
2 files changed, 6 insertions, 13 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/transport/server/server.go b/plumbing/transport/server/server.go index 20bd12e..8e0dcc1 100644 --- a/plumbing/transport/server/server.go +++ b/plumbing/transport/server/server.go @@ -286,11 +286,6 @@ func (s *rpSession) updateReferences(req *packp.ReferenceUpdateRequest) { continue } - if err != nil { - s.setStatus(cmd.Name, err) - continue - } - ref := plumbing.NewHashReference(cmd.Name, cmd.New) err := s.storer.SetReference(ref) s.setStatus(cmd.Name, err) |