introduce git.InitSimple and git.InitWithConfigSync, make serv cmd use gitconfig

wxiaoguang · wxiaoguang · commit 45a9375c7b45 · 2022-05-17T17:15:45.000+08:00
diff --git a/cmd/serv.go b/cmd/serv.go
@@ -6,6 +6,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -64,6 +65,19 @@ func setup(logPath string, debug bool) {
 	if debug {
 		setting.RunMode = "dev"
 	}
+
+	// Check if setting.RepoRootPath exists. It could be the case that it doesn't exist, this can happen when
+	// `[repository]` `ROOT` is a relative path and $GITEA_WORK_DIR isn't passed to the SSH connection.
+	if _, err := os.Stat(setting.RepoRootPath); err != nil {
+		if os.IsNotExist(err) {
+			_ = fail("Incorrect configuration.", "Directory `[repository].ROOT` was not found, please check if $GITEA_WORK_DIR is passed to the SSH connection or make `[repository].ROOT` an absolute value.")
+			return
+		}
+	}
+
+	if err := git.InitSimple(context.Background()); err != nil {
+		_ = fail("Failed to init git", "Failed to init git")
+	}
 }
 
 var (
@@ -79,8 +93,8 @@ var (
 func fail(userMessage, logMessage string, args ...interface{}) error {
 	// There appears to be a chance to cause a zombie process and failure to read the Exit status
 	// if nothing is outputted on stdout.
-	fmt.Fprintln(os.Stdout, "")
-	fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
+	_, _ = fmt.Fprintln(os.Stdout, "")
+	_, _ = fmt.Fprintln(os.Stderr, "Gitea:", userMessage)
 
 	if len(logMessage) > 0 {
 		if !setting.IsProd {
@@ -297,19 +311,11 @@ func runServ(c *cli.Context) error {
 		gitcmd = exec.CommandContext(ctx, verb, repoPath)
 	}
 
-	// Check if setting.RepoRootPath exists. It could be the case that it doesn't exist, this can happen when
-	// `[repository]` `ROOT` is a relative path and $GITEA_WORK_DIR isn't passed to the SSH connection.
-	if _, err := os.Stat(setting.RepoRootPath); err != nil {
-		if os.IsNotExist(err) {
-			return fail("Incorrect configuration.",
-				"Directory `[repository]` `ROOT` was not found, please check if $GITEA_WORK_DIR is passed to the SSH connection or make `[repository]` `ROOT` an absolute value.")
-		}
-	}
-
 	gitcmd.Dir = setting.RepoRootPath
 	gitcmd.Stdout = os.Stdout
 	gitcmd.Stdin = os.Stdin
 	gitcmd.Stderr = os.Stderr
+	gitcmd.Env = append(gitcmd.Env, git.CommonEnvs()...)
 	if err = gitcmd.Run(); err != nil {
 		return fail("Internal error", "Failed to execute git command: %v", err)
 	}
diff --git a/integrations/integration_test.go b/integrations/integration_test.go
@@ -262,7 +262,7 @@ func prepareTestEnv(t testing.TB, skip ...int) func() {
 	assert.NoError(t, unittest.LoadFixtures())
 	assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
 	assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
-	assert.NoError(t, git.Init(context.Background()))
+	assert.NoError(t, git.InitWithConfigSync(context.Background()))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	if err != nil {
 		assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
@@ -563,7 +563,7 @@ func resetFixtures(t *testing.T) {
 	assert.NoError(t, unittest.LoadFixtures())
 	assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
 	assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
-	assert.NoError(t, git.Init(context.Background()))
+	assert.NoError(t, git.InitWithConfigSync(context.Background()))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	if err != nil {
 		assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
diff --git a/integrations/migration-test/migration_test.go b/integrations/migration-test/migration_test.go
@@ -62,7 +62,7 @@ func initMigrationTest(t *testing.T) func() {
 	assert.True(t, len(setting.RepoRootPath) != 0)
 	assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
 	assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
-	assert.NoError(t, git.Init(context.Background()))
+	assert.NoError(t, git.InitWithConfigSync(context.Background()))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	if err != nil {
 		assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
diff --git a/models/migrations/migrations_test.go b/models/migrations/migrations_test.go
@@ -203,7 +203,7 @@ func prepareTestEnv(t *testing.T, skip int, syncModels ...interface{}) (*xorm.En
 	deferFn := PrintCurrentTest(t, ourSkip)
 	assert.NoError(t, os.RemoveAll(setting.RepoRootPath))
 	assert.NoError(t, unittest.CopyDir(path.Join(filepath.Dir(setting.AppPath), "integrations/gitea-repositories-meta"), setting.RepoRootPath))
-	assert.NoError(t, git.Init(context.Background()))
+	assert.NoError(t, git.InitWithConfigSync(context.Background()))
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	if err != nil {
 		assert.NoError(t, err, "unable to read the new repo root: %v\n", err)
diff --git a/models/unittest/testdb.go b/models/unittest/testdb.go
@@ -107,7 +107,7 @@ func MainTest(m *testing.M, testOpts *TestOptions) {
 
 	setting.Packages.Storage.Path = filepath.Join(setting.AppDataPath, "packages")
 
-	if err = git.Init(context.Background()); err != nil {
+	if err = git.InitWithConfigSync(context.Background()); err != nil {
 		fatalTestError("git.Init: %v\n", err)
 	}
 
@@ -203,7 +203,7 @@ func PrepareTestEnv(t testing.TB) {
 	assert.NoError(t, util.RemoveAll(setting.RepoRootPath))
 	metaPath := filepath.Join(giteaRoot, "integrations", "gitea-repositories-meta")
 	assert.NoError(t, CopyDir(metaPath, setting.RepoRootPath))
-	assert.NoError(t, git.Init(context.Background()))
+	assert.NoError(t, git.InitWithConfigSync(context.Background()))
 
 	ownerDirs, err := os.ReadDir(setting.RepoRootPath)
 	assert.NoError(t, err)
diff --git a/modules/git/command.go b/modules/git/command.go
@@ -106,6 +106,16 @@ type RunOpts struct {
 	PipelineFunc   func(context.Context, context.CancelFunc) error
 }
 
+func CommonEnvs() []string {
+	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)
+		"GIT_CONFIG_NOSYSTEM=1",                 // https://git-scm.com/docs/git-config
+		"GIT_CONFIG_GLOBAL=" + GlobalConfigFile, // make Gitea use internal git config only, to prevent conflicts with user's git config
+	}
+}
+
 // Run runs the command with the RunOpts
 func (c *Command) Run(opts *RunOpts) error {
 	if opts == nil {
@@ -158,15 +168,7 @@ func (c *Command) Run(opts *RunOpts) error {
 		log.Warn("GlobalConfigFile is empty, the git module is not initialized correctly, using a temp gitconfig (%s) temporarily", GlobalConfigFile)
 	}
 
-	cmd.Env = append(
-		cmd.Env,
-		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)
-		"GIT_CONFIG_NOSYSTEM=1",               // https://git-scm.com/docs/git-config
-		"GIT_CONFIG_GLOBAL="+GlobalConfigFile, // make Gitea use internal git config only, to prevent conflicts with user's git config
-	)
-
+	cmd.Env = append(cmd.Env, CommonEnvs()...)
 	cmd.Dir = opts.Dir
 	cmd.Stdout = opts.Stdout
 	cmd.Stderr = opts.Stderr
diff --git a/modules/git/git.go b/modules/git/git.go
@@ -35,7 +35,7 @@ var (
 	GlobalConfigFile string
 
 	// DefaultContext is the default context to run git commands in
-	// will be overwritten by Init with HammerContext
+	// will be overwritten by InitWithConfigSync with HammerContext
 	DefaultContext = context.Background()
 
 	// SupportProcReceive version >= 2.29.0
@@ -129,8 +129,9 @@ func VersionInfo() string {
 	return fmt.Sprintf(format, args...)
 }
 
-// Init initializes git module
-func Init(ctx context.Context) error {
+// InitSimple initializes git module with a very simple step, no config changes, no global command arguments.
+// This method doesn't change anything to filesystem
+func InitSimple(ctx context.Context) error {
 	DefaultContext = ctx
 
 	if setting.Git.Timeout.Default > 0 {
@@ -141,9 +142,6 @@ func Init(ctx context.Context) error {
 		return errors.New("RepoRootPath is empty, git module needs that setting before initialization")
 	}
 
-	if err := os.MkdirAll(setting.RepoRootPath, os.ModePerm); err != nil {
-		return fmt.Errorf("unable to create directory %s, err:%w", setting.RepoRootPath, err)
-	}
 	GlobalConfigFile = setting.RepoRootPath + "/gitconfig"
 
 	if err := SetExecutablePath(setting.Git.Path); err != nil {
@@ -153,6 +151,20 @@ func Init(ctx context.Context) error {
 	// force cleanup args
 	globalCommandArgs = []string{}
 
+	return nil
+}
+
+// InitWithConfigSync initializes git module. This method may create directories or write files into filesystem
+func InitWithConfigSync(ctx context.Context) error {
+	err := InitSimple(ctx)
+	if err != nil {
+		return err
+	}
+
+	if err = os.MkdirAll(setting.RepoRootPath, os.ModePerm); err != nil {
+		return fmt.Errorf("unable to create directory %s, err:%w", setting.RepoRootPath, err)
+	}
+
 	if CheckGitVersionAtLeast("2.9") == nil {
 		// Explicitly disable credential helper, otherwise Git credentials might leak
 		globalCommandArgs = append(globalCommandArgs, "-c", "credential.helper=")
@@ -223,13 +235,11 @@ func Init(ctx context.Context) error {
 		if err := configSet("core.longpaths", "true"); err != nil {
 			return err
 		}
-	}
-	if setting.Git.DisableCoreProtectNTFS {
-		if err := configSet("core.protectntfs", "false"); err != nil {
-			return err
+		if setting.Git.DisableCoreProtectNTFS {
+			globalCommandArgs = append(globalCommandArgs, "-c", "core.protectntfs=false")
 		}
-		globalCommandArgs = append(globalCommandArgs, "-c", "core.protectntfs=false")
 	}
+
 	return nil
 }
 
diff --git a/modules/git/git_test.go b/modules/git/git_test.go
@@ -28,7 +28,7 @@ func testRun(m *testing.M) error {
 	defer util.RemoveAll(repoRootPath)
 	setting.RepoRootPath = repoRootPath
 
-	if err = Init(context.Background()); err != nil {
+	if err = InitWithConfigSync(context.Background()); err != nil {
 		return fmt.Errorf("failed to call Init: %w", err)
 	}
 
diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go
@@ -121,7 +121,7 @@ type CheckAttributeReader struct {
 	cancel      context.CancelFunc
 }
 
-// Init initializes the cmd
+// InitWithConfigSync initializes the cmd
 func (c *CheckAttributeReader) Init(ctx context.Context) error {
 	cmdArgs := []string{"check-attr", "--stdin", "-z"}
 
diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go
@@ -29,7 +29,7 @@ func TestMain(m *testing.M) {
 }
 
 func TestRepoStatsIndex(t *testing.T) {
-	if err := git.Init(context.Background()); !assert.NoError(t, err) {
+	if err := git.InitWithConfigSync(context.Background()); !assert.NoError(t, err) {
 		return
 	}
 
diff --git a/routers/init.go b/routers/init.go
@@ -102,7 +102,7 @@ func GlobalInitInstalled(ctx context.Context) {
 		log.Fatal("Gitea is not installed")
 	}
 
-	mustInitCtx(ctx, git.Init)
+	mustInitCtx(ctx, git.InitWithConfigSync)
 	log.Info("Git Version: %s (config: %s)", git.VersionInfo(), git.GlobalConfigFile)
 
 	git.CheckLFSVersion()

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func testRun(m *testing.M) error {`
`28`	`28`	`defer util.RemoveAll(repoRootPath)`
`29`	`29`	`setting.RepoRootPath = repoRootPath`
`30`	`30`
`31`		`- if err = Init(context.Background()); err != nil {`
	`31`	`+ if err = InitWithConfigSync(context.Background()); err != nil {`
`32`	`32`	`return fmt.Errorf("failed to call Init: %w", err)`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ type CheckAttributeReader struct {`
`121`	`121`	`cancel context.CancelFunc`
`122`	`122`	`}`
`123`	`123`
`124`		`-// Init initializes the cmd`
	`124`	`+// InitWithConfigSync initializes the cmd`
`125`	`125`	`func (c *CheckAttributeReader) Init(ctx context.Context) error {`
`126`	`126`	`cmdArgs := []string{"check-attr", "--stdin", "-z"}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func TestMain(m *testing.M) {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`func TestRepoStatsIndex(t *testing.T) {`
`32`		`- if err := git.Init(context.Background()); !assert.NoError(t, err) {`
	`32`	`+ if err := git.InitWithConfigSync(context.Background()); !assert.NoError(t, err) {`
`33`	`33`	`return`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ func GlobalInitInstalled(ctx context.Context) {`
`102`	`102`	`log.Fatal("Gitea is not installed")`
`103`	`103`	`}`
`104`	`104`
`105`		`- mustInitCtx(ctx, git.Init)`
	`105`	`+ mustInitCtx(ctx, git.InitWithConfigSync)`
`106`	`106`	`log.Info("Git Version: %s (config: %s)", git.VersionInfo(), git.GlobalConfigFile)`
`107`	`107`
`108`	`108`	`git.CheckLFSVersion()`