aboutsummaryrefslogtreecommitdiffstats
path: root/modules/setting/git.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/setting/git.go')
-rw-r--r--modules/setting/git.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/setting/git.go b/modules/setting/git.go
index 4163f1039d..8495be8836 100644
--- a/modules/setting/git.go
+++ b/modules/setting/git.go
@@ -16,6 +16,7 @@ import (
var (
// Git settings
Git = struct {
+ Path string
DisableDiffHighlight bool
MaxGitDiffLines int
MaxGitDiffLineCharacters int
@@ -59,6 +60,9 @@ func newGit() {
if err := Cfg.Section("git").MapTo(&Git); err != nil {
log.Fatal("Failed to map Git settings: %v", err)
}
+ if err := git.SetExecutablePath(Git.Path); err != nil {
+ log.Fatal("Failed to initialize Git settings", err)
+ }
git.DefaultCommandExecutionTimeout = time.Duration(Git.Timeout.Default) * time.Second
binVersion, err := git.BinVersion()