diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2021-12-30 13:11:58 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-04 09:07:15 +1100 |
| commit | b028f37ba8724d9d46a4521d819d60e2cf9cc977 (patch) | |
| tree | 4b3568b0989e6c03f023357049c372c1494adace /pkg/gui/patch_options_panel.go | |
| parent | 1fc0d786aef2e3c0e1ccfe3f33f22dbafbbda87f (diff) | |
updating specs
Diffstat (limited to 'pkg/gui/patch_options_panel.go')
| -rw-r--r-- | pkg/gui/patch_options_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/patch_options_panel.go b/pkg/gui/patch_options_panel.go index 3e36c4983..8a57e9244 100644 --- a/pkg/gui/patch_options_panel.go +++ b/pkg/gui/patch_options_panel.go @@ -26,7 +26,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu() error { }, } - if gui.GitCommand.PatchManager.CanRebase && gui.workingTreeState() == commands.REBASE_MODE_NORMAL { + if gui.GitCommand.PatchManager.CanRebase && gui.GitCommand.WorkingTreeState() == commands.REBASE_MODE_NONE { menuItems = append(menuItems, []*menuItem{ { displayString: fmt.Sprintf("remove patch from original commit (%s)", gui.GitCommand.PatchManager.To), @@ -74,7 +74,7 @@ func (gui *Gui) getPatchCommitIndex() int { } func (gui *Gui) validateNormalWorkingTreeState() (bool, error) { - if gui.GitCommand.WorkingTreeState() != commands.REBASE_MODE_NORMAL { + if gui.GitCommand.WorkingTreeState() != commands.REBASE_MODE_NONE { return false, gui.createErrorPanel(gui.Tr.CantPatchWhileRebasingError) } return true, nil |