summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/git_flow_controller.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/controllers/git_flow_controller.go')
-rw-r--r--pkg/gui/controllers/git_flow_controller.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/gui/controllers/git_flow_controller.go b/pkg/gui/controllers/git_flow_controller.go
index 45ce0a5d0..7c3e45603 100644
--- a/pkg/gui/controllers/git_flow_controller.go
+++ b/pkg/gui/controllers/git_flow_controller.go
@@ -1,6 +1,7 @@
package controllers
import (
+ "errors"
"fmt"
"github.com/jesseduffield/lazygit/pkg/commands/models"
@@ -46,7 +47,7 @@ func (self *GitFlowController) GetKeybindings(opts types.KeybindingsOpts) []*typ
func (self *GitFlowController) handleCreateGitFlowMenu(branch *models.Branch) error {
if !self.c.Git().Flow.GitFlowEnabled() {
- return self.c.ErrorMsg("You need to install git-flow and enable it in this repo to use git-flow features")
+ return errors.New("You need to install git-flow and enable it in this repo to use git-flow features")
}
startHandler := func(branchType string) func() error {
@@ -103,7 +104,7 @@ func (self *GitFlowController) handleCreateGitFlowMenu(branch *models.Branch) er
func (self *GitFlowController) gitFlowFinishBranch(branchName string) error {
cmdObj, err := self.c.Git().Flow.FinishCmdObj(branchName)
if err != nil {
- return self.c.Error(err)
+ return err
}
self.c.LogAction(self.c.Tr.Actions.GitFlowFinish)