3 files changed, 7 insertions, 14 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)
diff --git a/remote.go b/remote.go
index e229ef1..baee7a0 100644
--- a/remote.go
+++ b/remote.go
@@ -937,7 +937,7 @@ func (r *Remote) updateLocalReferenceStorage(
 		updated = true
 	}
 
-	if err == nil && forceNeeded {
+	if forceNeeded {
 		err = ErrForceNeeded
 	}