USEFULL/gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-05-31 11:42:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

models/pull: treat all errors as conflict (#4265)

Browse Source 
If there is a misdetection, log shows everything.
This commit is contained in:
Unknwon 2017-03-09 13:36:40 -05:00
parent f860ddbbb7
commit c3cde864f8
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
models/pull.go
View File

@ -329,12 +329,6 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return nil return nil
} }
// patchConflicts is a list of conflit description from Git.
var patchConflicts = []string{
"fatal:",
"error:",
}
// testPatch checks if patch can be merged to base repository without conflit. // testPatch checks if patch can be merged to base repository without conflit.
// FIXME: make a mechanism to clean up stable local copies. // FIXME: make a mechanism to clean up stable local copies.
func (pr *PullRequest) testPatch() (err error) { func (pr *PullRequest) testPatch() (err error) {
@ -370,15 +364,9 @@ func (pr *PullRequest) testPatch() (err error) {
fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID), fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
"git", "apply", "--check", patchPath) "git", "apply", "--check", patchPath)
if err != nil { if err != nil {
for i := range patchConflicts { log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr)
if strings.Contains(stderr, patchConflicts[i]) { pr.Status = PULL_REQUEST_STATUS_CONFLICT
log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr) return nil
pr.Status = PULL_REQUEST_STATUS_CONFLICT
return nil
}
}
return fmt.Errorf("git apply --check: %v - %s", err, stderr)
} }
return nil return nil
} }