aboutsummaryrefslogtreecommitdiffstats
path: root/modules/git/command.go
diff options
context:
space:
mode:
Diffstat (limited to 'modules/git/command.go')
-rw-r--r--modules/git/command.go33
1 files changed, 23 insertions, 10 deletions
diff --git a/modules/git/command.go b/modules/git/command.go
index d71497f1d7..a1bacbb707 100644
--- a/modules/git/command.go
+++ b/modules/git/command.go
@@ -105,23 +105,36 @@ type RunOpts struct {
PipelineFunc func(context.Context, context.CancelFunc) error
}
-// CommonGitCmdEnvs returns the common environment variables for a "git" command.
-func CommonGitCmdEnvs() []string {
+func commonBaseEnvs() []string {
// at the moment, do not set "GIT_CONFIG_NOSYSTEM", users may have put some configs like "receive.certNonceSeed" in it
- return []string{
- fmt.Sprintf("LC_ALL=%s", DefaultLocale),
- "GIT_TERMINAL_PROMPT=0", // avoid prompting for credentials interactively, supported since git v2.3
- "GIT_NO_REPLACE_OBJECTS=1", // ignore replace references (https://git-scm.com/docs/git-replace)
+ envs := []string{
"HOME=" + HomeDir(), // make Gitea use internal git config only, to prevent conflicts with user's git config
+ "GIT_NO_REPLACE_OBJECTS=1", // ignore replace references (https://git-scm.com/docs/git-replace)
+ }
+
+ // some environment variables should be passed to git command
+ passThroughEnvKeys := []string{
+ "GNUPGHOME", // git may call gnupg to do commit signing
+ }
+ for _, key := range passThroughEnvKeys {
+ if val, ok := os.LookupEnv(key); ok {
+ envs = append(envs, key+"="+val)
+ }
}
+ return envs
+}
+
+// CommonGitCmdEnvs returns the common environment variables for a "git" command.
+func CommonGitCmdEnvs() []string {
+ return append(commonBaseEnvs(), []string{
+ "LC_ALL=" + DefaultLocale,
+ "GIT_TERMINAL_PROMPT=0", // avoid prompting for credentials interactively, supported since git v2.3
+ }...)
}
// CommonCmdServEnvs is like CommonGitCmdEnvs but it only returns minimal required environment variables for the "gitea serv" command
func CommonCmdServEnvs() []string {
- return []string{
- "GIT_NO_REPLACE_OBJECTS=1", // ignore replace references (https://git-scm.com/docs/git-replace)
- "HOME=" + HomeDir(), // make Gitea use internal git config only, to prevent conflicts with user's git config
- }
+ return commonBaseEnvs()
}
// Run runs the command with the RunOpts