From 706b0f72e2e4bc91bdbed38fee609cabe9f44e43 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 29 Oct 2015 20:40:57 -0400 Subject: fix issue comment mention and autofix count when start --- models/pull.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'models/pull.go') diff --git a/models/pull.go b/models/pull.go index 55f17fc2..0300c083 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. -- cgit v1.2.3