summaryrefslogtreecommitdiffstats
path: root/pkg/gui/git_flow.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-01-29 19:09:20 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-03-17 19:13:40 +1100
commit138be04e6575f2bd087630e49d122af578c78bf6 (patch)
treeed038641d6871e49ff426096f300e6b3b3ab4f1e /pkg/gui/git_flow.go
parent1a74ed32143f826104e1d60f4392d2d8ba53cd80 (diff)
refactor contexts code
Diffstat (limited to 'pkg/gui/git_flow.go')
-rw-r--r--pkg/gui/git_flow.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/git_flow.go b/pkg/gui/git_flow.go
index 171310785..eecd5328c 100644
--- a/pkg/gui/git_flow.go
+++ b/pkg/gui/git_flow.go
@@ -3,7 +3,7 @@ package gui
import (
"fmt"
- "github.com/jesseduffield/lazygit/pkg/gui/popup"
+ "github.com/jesseduffield/lazygit/pkg/gui/types"
"github.com/jesseduffield/lazygit/pkg/utils"
)
@@ -21,7 +21,7 @@ func (gui *Gui) handleCreateGitFlowMenu() error {
return func() error {
title := utils.ResolvePlaceholderString(gui.c.Tr.NewGitFlowBranchPrompt, map[string]string{"branchType": branchType})
- return gui.c.Prompt(popup.PromptOpts{
+ return gui.c.Prompt(types.PromptOpts{
Title: title,
HandleConfirm: func(name string) error {
gui.c.LogAction(gui.c.Tr.Actions.GitFlowStart)
@@ -33,9 +33,9 @@ func (gui *Gui) handleCreateGitFlowMenu() error {
}
}
- return gui.c.Menu(popup.CreateMenuOptions{
+ return gui.c.Menu(types.CreateMenuOptions{
Title: "git flow",
- Items: []*popup.MenuItem{
+ Items: []*types.MenuItem{
{
// not localising here because it's one to one with the actual git flow commands
DisplayString: fmt.Sprintf("finish branch '%s'", branch.Name),