diff options
| author | Christian Muehlhaeuser <muesli@gmail.com> | 2019-07-19 04:00:02 +0200 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-07-27 10:52:06 +1000 |
| commit | 975a5315b036b84e0d8befd7ca5e7dbc062caf84 (patch) | |
| tree | 3adc6592adb8fc24b14444eab11e3a5a2cb50a20 | |
| parent | 8f734b11e3e57e3338841305bba074846c6b5a58 (diff) | |
Simplified code a bit
| -rw-r--r-- | pkg/commands/git.go | 6 | ||||
| -rw-r--r-- | pkg/gui/theme.go | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index fa1a73157..3bda46ee3 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -906,10 +906,8 @@ func (c *GitCommand) DiscardOldFileChanges(commits []*Commit, commitIndex int, f if err := c.StageFile(fileName); err != nil { return err } - } else { - if err := c.CheckoutFile("HEAD^", fileName); err != nil { - return err - } + } else if err := c.CheckoutFile("HEAD^", fileName); err != nil { + return err } // amend the commit diff --git a/pkg/gui/theme.go b/pkg/gui/theme.go index dbc8b904b..1f87e325e 100644 --- a/pkg/gui/theme.go +++ b/pkg/gui/theme.go @@ -31,7 +31,7 @@ func (gui *Gui) GetAttribute(key string) gocui.Attribute { func (gui *Gui) GetColor(keys []string) gocui.Attribute { var attribute gocui.Attribute for _, key := range keys { - attribute = attribute | gui.GetAttribute(key) + attribute |= gui.GetAttribute(key) } return attribute } |