From f88aa1d21572beafc5a22db0c9712751f47fc0ac Mon Sep 17 00:00:00 2001 From: Mura Li Date: Sun, 7 Jul 2019 15:26:56 +0800 Subject: Support git.PATH entry in app.ini (#6772) --- modules/git/git.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'modules/git') diff --git a/modules/git/git.go b/modules/git/git.go index fda6f45251..964760dfda 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -77,20 +77,27 @@ func BinVersion() (string, error) { return gitVersion, nil } -func init() { +// SetExecutablePath changes the path of git executable and checks the file permission and version. +func SetExecutablePath(path string) error { + // If path is empty, we use the default value of GitExecutable "git" to search for the location of git. + if path != "" { + GitExecutable = path + } absPath, err := exec.LookPath(GitExecutable) if err != nil { - panic(fmt.Sprintf("Git not found: %v", err)) + return fmt.Errorf("Git not found: %v", err) } GitExecutable = absPath gitVersion, err := BinVersion() if err != nil { - panic(fmt.Sprintf("Git version missing: %v", err)) + return fmt.Errorf("Git version missing: %v", err) } if version.Compare(gitVersion, GitVersionRequired, "<") { - panic(fmt.Sprintf("Git version not supported. Requires version > %v", GitVersionRequired)) + return fmt.Errorf("Git version not supported. Requires version > %v", GitVersionRequired) } + + return nil } // Init initializes git module -- cgit v1.2.3