diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-05 22:30:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 09:39:54 +1100 |
| commit | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (patch) | |
| tree | 137f8360a1416b08cc6c327ba47b07a4670366d6 /pkg/gui/status_panel.go | |
| parent | cce6f405a5643ed46a6bc0b9fd7cf132c915c9f3 (diff) | |
more work on rebasing including visual indicators
Diffstat (limited to 'pkg/gui/status_panel.go')
| -rw-r--r-- | pkg/gui/status_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index 8d3b34dfe..16017abba 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -22,11 +22,11 @@ func (gui *Gui) refreshStatus(g *gocui.Gui) error { pushables, pullables := gui.GitCommand.GetCurrentBranchUpstreamDifferenceCount() fmt.Fprint(v, "↑"+pushables+"↓"+pullables) branches := gui.State.Branches - if err := gui.updateHasMergeConflictStatus(); err != nil { + if err := gui.updateWorkTreeState(); err != nil { return err } - if gui.State.HasMergeConflicts { - fmt.Fprint(v, utils.ColoredString(" (merging)", color.FgYellow)) + if gui.State.WorkingTreeState != "normal" { + fmt.Fprint(v, utils.ColoredString(fmt.Sprintf(" (%s)", gui.State.WorkingTreeState), color.FgYellow)) } if len(branches) == 0 { |