diff options
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 5de1a7e3c..233f77e64 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -10,7 +10,7 @@ import ( func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error { options := []string{"continue", "abort"} - if gui.workingTreeState() == "rebasing" { + if gui.GitCommand.WorkingTreeState() == "rebasing" { options = append(options, "skip") } @@ -27,7 +27,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error } var title string - if gui.workingTreeState() == "merging" { + if gui.GitCommand.WorkingTreeState() == "merging" { title = gui.Tr.SLocalize("MergeOptionsTitle") } else { title = gui.Tr.SLocalize("RebaseOptionsTitle") @@ -37,7 +37,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu(g *gocui.Gui, v *gocui.View) error } func (gui *Gui) genericMergeCommand(command string) error { - status := gui.workingTreeState() + status := gui.GitCommand.WorkingTreeState() if status != "merging" && status != "rebasing" { return gui.createErrorPanel(gui.Tr.SLocalize("NotMergingOrRebasing")) |