diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-12-30 13:11:58 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-04 09:07:15 +1100 |
| commit | b028f37ba8724d9d46a4521d819d60e2cf9cc977 (patch) | |
| tree | 4b3568b0989e6c03f023357049c372c1494adace /pkg/gui/status_panel.go | |
| parent | 1fc0d786aef2e3c0e1ccfe3f33f22dbafbbda87f (diff) | |
updating specs
Diffstat (limited to 'pkg/gui/status_panel.go')
| -rw-r--r-- | pkg/gui/status_panel.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 4b64b0899..ee09f6187 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -28,7 +28,7 @@ func (gui *Gui) refreshStatus() { status += presentation.ColoredBranchStatus(currentBranch) + " " } - if gui.GitCommand.WorkingTreeState() != commands.REBASE_MODE_NORMAL { + if gui.GitCommand.WorkingTreeState() != commands.REBASE_MODE_NONE { status += style.FgYellow.Sprintf("(%s) ", gui.GitCommand.WorkingTreeState()) } @@ -156,15 +156,3 @@ func lazygitTitle() string { __/ | __/ | |___/ |___/ ` } - -func (gui *Gui) workingTreeState() commands.RebaseMode { - rebaseMode, _ := gui.GitCommand.RebaseMode() - if rebaseMode != "" { - return commands.REBASE_MODE_REBASING - } - merging, _ := gui.GitCommand.IsInMergeState() - if merging { - return commands.REBASE_MODE_MERGING - } - return commands.REBASE_MODE_NORMAL -} |