diff options
Diffstat (limited to 'modules/setting')
| -rw-r--r-- | modules/setting/git.go | 3 | ||||
| -rw-r--r-- | modules/setting/setting.go | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/setting/git.go b/modules/setting/git.go index 0ad16fc81e..8625c0e780 100644 --- a/modules/setting/git.go +++ b/modules/setting/git.go @@ -16,7 +16,6 @@ import ( var ( // Git settings Git = struct { - Version string `ini:"-"` DisableDiffHighlight bool MaxGitDiffLines int MaxGitDiffLineCharacters int @@ -65,6 +64,8 @@ func newGit() { log.Fatal("Error retrieving git version: %v", err) } + log.Info("Git Version: %s", binVersion) + if version.Compare(binVersion, "2.9", ">=") { // Explicitly disable credential helper, otherwise Git credentials might leak git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=") diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 461e394a62..de89c67d04 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -27,6 +27,7 @@ import ( _ "code.gitea.io/gitea/modules/minwinsvc" // import minwinsvc for windows services "code.gitea.io/gitea/modules/user" + "github.com/Unknwon/cae/zip" "github.com/Unknwon/com" _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache _ "github.com/go-macaron/cache/redis" @@ -931,6 +932,8 @@ func NewContext() { sec = Cfg.Section("U2F") U2F.TrustedFacets, _ = shellquote.Split(sec.Key("TRUSTED_FACETS").MustString(strings.TrimRight(AppURL, "/"))) U2F.AppID = sec.Key("APP_ID").MustString(strings.TrimRight(AppURL, "/")) + + zip.Verbose = false } func loadInternalToken(sec *ini.Section) string { |