diff options
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/models/pull.go b/models/pull.go index 55f17fc27c..0300c083d7 100644 --- a/models/pull.go +++ b/models/pull.go @@ -160,7 +160,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error } // Clone base repo. - tmpBasePath := path.Join("data/tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") + tmpBasePath := path.Join(setting.AppDataPath, "tmp/repos", com.ToStr(time.Now().Nanosecond())+".git") os.MkdirAll(path.Dir(tmpBasePath), os.ModePerm) defer os.RemoveAll(path.Dir(tmpBasePath)) @@ -214,6 +214,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error var patchConflicts = []string{ "patch does not apply", "already exists in working directory", + "unrecognized input", } // testPatch checks if patch can be merged to base repository without conflit. |