From c82606a92a3433477f152a946e78c99dfd20db9d Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Sun, 2 Jan 2022 17:27:01 +1100 Subject: [PATCH] fix broken format call --- pkg/gui/status_panel.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/gui/status_panel.go b/pkg/gui/status_panel.go index d6985dd0d..de9dc08ce 100644 --- a/pkg/gui/status_panel.go +++ b/pkg/gui/status_panel.go @@ -71,9 +71,16 @@ func (gui *Gui) handleStatusClick() error { cx, _ := gui.Views.Status.Cursor() upstreamStatus := presentation.BranchStatus(currentBranch) repoName := utils.GetCurrentRepoName() - switch gui.GitCommand.WorkingTreeState() { + workingTreeState := gui.GitCommand.WorkingTreeState() + switch workingTreeState { case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING: - workingTreeStatus := fmt.Sprintf("(%s)", gui.GitCommand.WorkingTreeState()) + var formattedState string + if workingTreeState == enums.REBASE_MODE_REBASING { + formattedState = "rebasing" + } else { + formattedState = "merging" + } + workingTreeStatus := fmt.Sprintf("(%s)", formattedState) if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) { return gui.handleCreateRebaseOptionsMenu() }