diff options
Diffstat (limited to 'pkg/gui/cherry_picking.go')
| -rw-r--r-- | pkg/gui/cherry_picking.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/cherry_picking.go b/pkg/gui/cherry_picking.go index fbda109b9..8f144084c 100644 --- a/pkg/gui/cherry_picking.go +++ b/pkg/gui/cherry_picking.go @@ -5,11 +5,11 @@ import "github.com/jesseduffield/lazygit/pkg/commands/models" // you can only copy from one context at a time, because the order and position of commits matter func (gui *Gui) resetCherryPickingIfNecessary(context Context) error { - oldContextKey := gui.State.Modes.CherryPicking.ContextKey + oldContextKey := ContextKey(gui.State.Modes.CherryPicking.ContextKey) if oldContextKey != context.GetKey() { // need to reset the cherry picking mode - gui.State.Modes.CherryPicking.ContextKey = context.GetKey() + gui.State.Modes.CherryPicking.ContextKey = string(context.GetKey()) gui.State.Modes.CherryPicking.CherryPickedCommits = make([]*models.Commit, 0) return gui.rerenderContextViewIfPresent(oldContextKey) @@ -156,7 +156,7 @@ func (gui *Gui) HandlePasteCommits() error { } func (gui *Gui) exitCherryPickingMode() error { - contextKey := gui.State.Modes.CherryPicking.ContextKey + contextKey := ContextKey(gui.State.Modes.CherryPicking.ContextKey) gui.State.Modes.CherryPicking.ContextKey = "" gui.State.Modes.CherryPicking.CherryPickedCommits = nil |