diff options
Diffstat (limited to 'pkg/gui/rebase_options_panel.go')
| -rw-r--r-- | pkg/gui/rebase_options_panel.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkg/gui/rebase_options_panel.go b/pkg/gui/rebase_options_panel.go index 482640fa2..e3e8ab621 100644 --- a/pkg/gui/rebase_options_panel.go +++ b/pkg/gui/rebase_options_panel.go @@ -18,7 +18,7 @@ const ( func (gui *Gui) handleCreateRebaseOptionsMenu() error { options := []string{REBASE_OPTION_CONTINUE, REBASE_OPTION_ABORT} - if gui.GitCommand.Status.WorkingTreeState() == enums.REBASE_MODE_REBASING { + if gui.Git.Status.WorkingTreeState() == enums.REBASE_MODE_REBASING { options = append(options, REBASE_OPTION_SKIP) } @@ -35,7 +35,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu() error { } var title string - if gui.GitCommand.Status.WorkingTreeState() == enums.REBASE_MODE_MERGING { + if gui.Git.Status.WorkingTreeState() == enums.REBASE_MODE_MERGING { title = gui.Tr.MergeOptionsTitle } else { title = gui.Tr.RebaseOptionsTitle @@ -45,7 +45,7 @@ func (gui *Gui) handleCreateRebaseOptionsMenu() error { } func (gui *Gui) genericMergeCommand(command string) error { - status := gui.GitCommand.Status.WorkingTreeState() + status := gui.Git.Status.WorkingTreeState() if status != enums.REBASE_MODE_MERGING && status != enums.REBASE_MODE_REBASING { return gui.createErrorPanel(gui.Tr.NotMergingOrRebasing) @@ -65,12 +65,12 @@ func (gui *Gui) genericMergeCommand(command string) error { // it's impossible for a rebase to require a commit so we'll use a subprocess only if it's a merge if status == enums.REBASE_MODE_MERGING && command != REBASE_OPTION_ABORT && gui.UserConfig.Git.Merging.ManualCommit { - // TODO: see if we should be calling more of the code from gui.GitCommand.Rebase.GenericMergeOrRebaseAction + // TODO: see if we should be calling more of the code from gui.Git.Rebase.GenericMergeOrRebaseAction return gui.runSubprocessWithSuspenseAndRefresh( - gui.GitCommand.Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command), + gui.Git.Rebase.GenericMergeOrRebaseActionCmdObj(commandType, command), ) } - result := gui.GitCommand.Rebase.GenericMergeOrRebaseAction(commandType, command) + result := gui.Git.Rebase.GenericMergeOrRebaseAction(commandType, command) if err := gui.handleGenericMergeCommandResult(result); err != nil { return err } @@ -141,7 +141,7 @@ func (gui *Gui) abortMergeOrRebaseWithConfirm() error { } func (gui *Gui) workingTreeStateNoun() string { - workingTreeState := gui.GitCommand.Status.WorkingTreeState() + workingTreeState := gui.Git.Status.WorkingTreeState() switch workingTreeState { case enums.REBASE_MODE_NONE: return "" |