diff options
| author | Jesse Duffield Duffield <jesseduffieldduffield@Jesses-MacBook-Pro-3.local> | 2019-02-24 11:03:14 +1100 |
|---|---|---|
| committer | Jesse Duffield Duffield <jesseduffieldduffield@Jesses-MacBook-Pro-3.local> | 2019-02-24 11:03:14 +1100 |
| commit | 1a19b1412d3da03992403cf62fddf06031de2927 (patch) | |
| tree | 404f1510bfd6d37e8971af16f129421c51f75be9 /pkg/gui | |
| parent | 95d451e59a419933f6e5f90305ffc6fe8dbc448f (diff) | |
remove old rebase code now that we're only ever interactively rebasing
Diffstat (limited to 'pkg/gui')
| -rw-r--r-- | pkg/gui/status_panel.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index a6bed8f83..9853760e7 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -94,14 +94,14 @@ func (gui *Gui) updateWorkTreeState() error { gui.State.WorkingTreeState = "merging" return nil } - rebaseMode, err := gui.GitCommand.RebaseMode() + isRebasing, err := gui.GitCommand.IsInRebasingState() if err != nil { return err } - if rebaseMode != "" { + if isRebasing { gui.State.WorkingTreeState = "rebasing" - return nil + } else { + gui.State.WorkingTreeState = "normal" } - gui.State.WorkingTreeState = "normal" return nil } |