Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/testhelper/testhelper.go')
-rw-r--r--internal/testhelper/testhelper.go19
1 files changed, 3 insertions, 16 deletions
diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go
index d0003e1e1..7681b9214 100644
--- a/internal/testhelper/testhelper.go
+++ b/internal/testhelper/testhelper.go
@@ -288,23 +288,10 @@ func ConfigureGit() error {
return fmt.Errorf("could not get caller info")
}
- goenvCmd := exec.Command("go", "env", "GOCACHE")
- goCacheBytes, err := goenvCmd.Output()
- goCache := strings.TrimSpace(string(goCacheBytes))
- if err != nil {
- return err
- }
-
- // set GOCACHE env to current go cache location, otherwise if it's default it would be overwritten by setting HOME
- err = os.Setenv("GOCACHE", goCache)
- if err != nil {
- return err
- }
-
- testHome := filepath.Join(filepath.Dir(currentFile), "testdata/home")
+ testConfig := filepath.Join(filepath.Dir(currentFile), "testdata/home/.gitconfig")
- // overwrite HOME env variable so user global .gitconfig doesn't influence tests
- return os.Setenv("HOME", testHome)
+ // overwrite GIT_CONFIG so user .gitconfig doesn't influence tests
+ return os.Setenv("GIT_CONFIG", testConfig)
}
// ConfigureRuby configures Ruby settings for test purposes at run time.