go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

fix broken format call

Browse Source
This commit is contained in:
Jesse Duffield 2022-01-02 17:27:01 +11:00
parent 194ff1630c
commit c82606a92a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gui/status_panel.go
View File

@ -71,9 +71,16 @@ func (gui *Gui) handleStatusClick() error {
cx, _ := gui.Views.Status.Cursor() cx, _ := gui.Views.Status.Cursor()
upstreamStatus := presentation.BranchStatus(currentBranch) upstreamStatus := presentation.BranchStatus(currentBranch)
repoName := utils.GetCurrentRepoName() repoName := utils.GetCurrentRepoName()
switch gui.GitCommand.WorkingTreeState() { workingTreeState := gui.GitCommand.WorkingTreeState()
switch workingTreeState {
case enums.REBASE_MODE_REBASING, enums.REBASE_MODE_MERGING: 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) { if cursorInSubstring(cx, upstreamStatus+" ", workingTreeStatus) {
return gui.handleCreateRebaseOptionsMenu() return gui.handleCreateRebaseOptionsMenu()
} }