From f860ddbbb729dbe4d074acdafb0dd9853ecfeafb Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 9 Mar 2017 13:04:41 -0500 Subject: [PATCH] models/pull: better error message detection (#4265) Stop using English phrases in case of Git localization. --- models/pull.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/models/pull.go b/models/pull.go index 8e9e0c5d7..054d26493 100644 --- a/models/pull.go +++ b/models/pull.go @@ -331,9 +331,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error // patchConflicts is a list of conflit description from Git. var patchConflicts = []string{ - "patch does not apply", - "already exists in working directory", - "unrecognized input", + "fatal:", "error:", } @@ -374,8 +372,7 @@ func (pr *PullRequest) testPatch() (err error) { if err != nil { for i := range patchConflicts { if strings.Contains(stderr, patchConflicts[i]) { - log.Trace("PullRequest[%d].testPatch (apply): has conflit", pr.ID) - fmt.Println(stderr) + log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr) pr.Status = PULL_REQUEST_STATUS_CONFLICT return nil }