summaryrefslogtreecommitdiffstats
path: root/pkg/gui
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-03-02 20:00:26 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-03-02 20:00:26 +1100
commit0c886eddfb429f31352d0908fe993d415d7d3709 (patch)
tree00ded3a52ba73d1d200af9dd6cf5c9fdfd6ef3a2 /pkg/gui
parent399346c2eef5d4e40e9c3b5252addd3dbb5b3598 (diff)
Revert "remove old rebase code now that we're only ever interactively rebasing"
Diffstat (limited to 'pkg/gui')
-rw-r--r--pkg/gui/status_panel.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go
index 8c03c30de..0ac9bd662 100644
--- a/pkg/gui/status_panel.go
+++ b/pkg/gui/status_panel.go
@@ -101,14 +101,14 @@ func (gui *Gui) updateWorkTreeState() error {
gui.State.WorkingTreeState = "merging"
return nil
}
- isRebasing, err := gui.GitCommand.IsInRebasingState()
+ rebaseMode, err := gui.GitCommand.RebaseMode()
if err != nil {
return err
}
- if isRebasing {
+ if rebaseMode != "" {
gui.State.WorkingTreeState = "rebasing"
- } else {
- gui.State.WorkingTreeState = "normal"
+ return nil
}
+ gui.State.WorkingTreeState = "normal"
return nil
}