Replace with runCommand function

Author: ruudk

pkg/gui/controllers/helpers/refs_helper.go

@@ -2,10 +2,6 @@ package helpers
 
 import (
 	"fmt"
-	"strings"
-	"text/template"
-	"time"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
@@ -14,6 +10,8 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
+	"strings"
+	"text/template"
 )
 
 type IRefsHelper interface {
@@ -334,8 +332,12 @@ func (self *RefsHelper) NewBranch(from string, fromFormattedName string, suggest
 		var err error
 
 		suggestedBranchName, err = utils.ResolveTemplate(self.c.UserConfig().Git.BranchPrefix, nil, template.FuncMap{
-			"formatCurrentDate": func(layout string) string {
-				return time.Now().Format(layout)
+			"runCommand": func(command string) (string, error) {
+				output, err := self.c.Git().Custom.RunWithOutput(command)
+				if err != nil {
+					return "", err
+				}
+				return strings.TrimRight(output, "\r\n"), nil
 			},
 		})
 		if err != nil {

pkg/gui/services/custom_commands/handler_creator.go

@@ -3,17 +3,15 @@ package custom_commands
 import (
 	"errors"
 	"fmt"
-	"strings"
-	"text/template"
-	"time"
-
 	"github.com/jesseduffield/gocui"
 	"github.com/jesseduffield/lazygit/pkg/config"
 	"github.com/jesseduffield/lazygit/pkg/gui/controllers/helpers"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/samber/lo"
+	"strings"
+	"text/template"
 )
 
 // takes a custom command and returns a function that will be called when the corresponding user-defined keybinding is pressed
@@ -248,8 +246,12 @@ func (self *HandlerCreator) getResolveTemplateFn(form map[string]string, promptR
 
 	funcs := template.FuncMap{
 		"quote": self.c.OS().Quote,
-		"formatCurrentDate": func(layout string) string {
-			return time.Now().Format(layout)
+		"runCommand": func(command string) (string, error) {
+			output, err := self.c.Git().Custom.RunWithOutput(command)
+			if err != nil {
+				return "", err
+			}
+			return strings.TrimRight(output, "\r\n"), nil
 		},
 	}