Merge branch 'main' into fix-14025-edit-pr-permissions

Author: zeripath

contrib/systemd/gitea.service

@@ -3,22 +3,22 @@ Description=Gitea (Git with a cup of tea)
 After=syslog.target
 After=network.target
 ###
-# Don't forget to add the database service requirements
+# Don't forget to add the database service dependencies
 ###
 #
-#Requires=mysql.service
+#Wants=mysql.service
 #After=mysql.service
 #
-#Requires=mariadb.service
+#Wants=mariadb.service
 #After=mariadb.service
 #
-#Requires=postgresql.service
+#Wants=postgresql.service
 #After=postgresql.service
 #
-#Requires=memcached.service
+#Wants=memcached.service
 #After=memcached.service
 #
-#Requires=redis.service
+#Wants=redis.service
 #After=redis.service
 #
 ###

modules/git/command.go

@@ -124,12 +124,18 @@ func (c *Command) RunInDirTimeoutEnvFullPipelineFunc(env []string, timeout time.
 
 	cmd := exec.CommandContext(ctx, c.name, c.args...)
 	if env == nil {
-		cmd.Env = append(os.Environ(), fmt.Sprintf("LC_ALL=%s", DefaultLocale))
+		cmd.Env = os.Environ()
 	} else {
 		cmd.Env = env
-		cmd.Env = append(cmd.Env, fmt.Sprintf("LC_ALL=%s", DefaultLocale))
 	}
 
+	cmd.Env = append(
+		cmd.Env,
+		fmt.Sprintf("LC_ALL=%s", DefaultLocale),
+		// avoid prompting for credentials interactively, supported since git v2.3
+		"GIT_TERMINAL_PROMPT=0",
+	)
+
 	// TODO: verify if this is still needed in golang 1.15
 	if goVersionLessThan115 {
 		cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1")