Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Fixed tautological error conditions #1183

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions plumbing/format/commitgraph/encoder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand All @@ -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()
}

Expand Down
5 changes: 0 additions & 5 deletions plumbing/transport/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion remote.go
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ func (r *Remote) updateLocalReferenceStorage(
updated = true
}

if err == nil && forceNeeded {
if forceNeeded {
err = ErrForceNeeded
}

Expand Down