Fixed git args duplication (#13411)

Because newGit() invoked twice (inside PreInstallInit() and
GlobalInit()) and git parameters is global object, all
git commands call with duplicated args
`-c credential.helper= -c protocol.version=2`
tokarchuk/v1.17
Viktor Suprun 4 years ago committed by GitHub
parent be880d4063
commit 7d16e6db8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      modules/setting/git.go

@ -74,6 +74,9 @@ func newGit() {
log.Fatal("Error retrieving git version: %v", err) log.Fatal("Error retrieving git version: %v", err)
} }
// force cleanup args
git.GlobalCommandArgs = []string{}
if git.CheckGitVersionAtLeast("2.9") == nil { if git.CheckGitVersionAtLeast("2.9") == nil {
// Explicitly disable credential helper, otherwise Git credentials might leak // Explicitly disable credential helper, otherwise Git credentials might leak
git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=") git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=")

Loading…
Cancel
Save