From f88aa1d21572beafc5a22db0c9712751f47fc0ac Mon Sep 17 00:00:00 2001
From: Mura Li <typeless@users.noreply.github.com>
Date: Sun, 7 Jul 2019 15:26:56 +0800
Subject: Support git.PATH entry in app.ini (#6772)

---
 modules/setting/git.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'modules/setting')

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()
-- 
cgit v1.2.3