Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.
Merged
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
5 changes: 1 addition & 4 deletions object_walker.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ func (p *objectWalker) walkAllRefs() error {
}
return p.walkObjectTree(ref.Hash())
})
if err != nil {
return err
}
return nil
return err
}

func (p *objectWalker) isSeen(hash plumbing.Hash) bool {
Expand Down
6 changes: 1 addition & 5 deletions storage/filesystem/internal/dotgit/dotgit.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,7 @@ func (d *DotGit) DeleteOldObjectPackAndIndex(hash plumbing.Hash, t time.Time) er
if err != nil {
return err
}
err = d.fs.Remove(d.objectPackPath(hash, `idx`))
if err != nil {
return err
}
return nil
return d.fs.Remove(d.objectPackPath(hash, `idx`))
}

// NewObject return a writer for a new object file.
Expand Down
4 changes: 2 additions & 2 deletions worktree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,7 @@ func (s *WorktreeSuite) TestGrep(c *C) {
break
}
}
if found != true {
if !found {
c.Errorf("unexpected grep results for %q, expected result to contain: %v", tc.name, wantResult)
}
}
Expand All @@ -1496,7 +1496,7 @@ func (s *WorktreeSuite) TestGrep(c *C) {
break
}
}
if found != false {
if found {
c.Errorf("unexpected grep results for %q, expected result to NOT contain: %v", tc.name, dontWantResult)
}
}
Expand Down