diff options
| author | Lauris BH <lauris@nix.lv> | 2018-01-11 01:46:59 +0200 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2018-01-11 00:46:59 +0100 |
| commit | be1330ec89308f76557bd7fc708b1f16c703f429 (patch) | |
| tree | abdcd377f6be772aa38e9840b683e09f52a5d5c4 /models/pull.go | |
| parent | d8dff304c0a6abb471051e968f6bdb69679b9a2a (diff) | |
| download | gitea-be1330ec89308f76557bd7fc708b1f16c703f429.tar.gz gitea-be1330ec89308f76557bd7fc708b1f16c703f429.zip | |
Remove hardcoded paths to fix randomly failing tests (#3347)
* Remove hardcoded paths to fix randomly failing tests
* Use correct function for merge path
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index c9357e9130..38312e4e40 100644 --- a/models/pull.go +++ b/models/pull.go @@ -299,7 +299,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle } // Clone base repo. - tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") + tmpBasePath := path.Join(LocalCopyPath(), "merge-"+com.ToStr(time.Now().Nanosecond())+".git") if err := os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm); err != nil { return fmt.Errorf("Failed to create dir %s: %v", tmpBasePath, err) |