go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

appease golangci

Browse Source
This commit is contained in:
Jesse Duffield
2019-03-12 19:20:19 +11:00
parent 3b2353b5ae
commit c98eddc185
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/commands/git.go
View File

@ -836,7 +836,7 @@ func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, f
// one where we handle the possibility of a credential request, and the other
// where we continue the rebase
if c.usingGpg() {
errors.New(c.Tr.SLocalize("DisabledForGPG"))
return errors.New(c.Tr.SLocalize("DisabledForGPG"))
}
commitSha := commits[commitIndex].Sha
@ -872,7 +872,7 @@ func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, f
// amend the commit
cmd, err = c.AmendHead()
if cmd != nil {
errors.New("received unexpected pointer to cmd")
return errors.New("received unexpected pointer to cmd")
}
if err != nil {
return err