fixup! Add a function to suggest a branch name based on branchPrefix

Author: stefanhaller

pkg/gui/controllers/helpers/refs_helper.go

@@ -322,10 +322,13 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 		},
 	)
 
-	var err error
-	suggestedBranchName, err = self.getSuggestedBranchName(suggestedBranchName)
-	if err != nil {
-		return err
+	if suggestedBranchName == "" {
+		var err error
+
+		suggestedBranchName, err = self.getSuggestedBranchName()
+		if err != nil {
+			return err
+		}
 	}
 
 	refresh := func() error {
@@ -585,13 +588,8 @@ func IsSwitchBranchUncommittedChangesError(err error) bool {
 	return strings.Contains(err.Error(), "Please commit your changes or stash them before you switch branch")
 }
 
-func (self *RefsHelper) getSuggestedBranchName(suggestedBranchName string) (string, error) {
-	var err error
-	if suggestedBranchName != "" {
-		return suggestedBranchName, nil
-	}
-
-	suggestedBranchName, err = utils.ResolveTemplate(self.c.UserConfig().Git.BranchPrefix, nil, template.FuncMap{
+func (self *RefsHelper) getSuggestedBranchName() (string, error) {
+	suggestedBranchName, err := utils.ResolveTemplate(self.c.UserConfig().Git.BranchPrefix, nil, template.FuncMap{
 		"runCommand": self.c.Git().Custom.TemplateFunctionRunCommand,
 	})
 	if err != nil {