git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

typo

Browse source
This commit is contained in:
Lunny Xiao 2016-12-01 09:05:32 +08:00
commit 646e02b521
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/pull.go
View file

@ -339,7 +339,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
return nil return nil
} }
// patchConflicts is a list of conflit description from Git. // patchConflicts is a list of conflict description from Git.
var patchConflicts = []string{ var patchConflicts = []string{
"patch does not apply", "patch does not apply",
"already exists in working directory", "already exists in working directory",
@ -347,7 +347,7 @@ var patchConflicts = []string{
"error:", "error:",
} }
// testPatch checks if patch can be merged to base repository without conflit. // testPatch checks if patch can be merged to base repository without conflict.
// 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) {
if pr.BaseRepo == nil { if pr.BaseRepo == nil {
@ -384,7 +384,7 @@ func (pr *PullRequest) testPatch() (err error) {
if err != nil { if err != nil {
for i := range patchConflicts { for i := range patchConflicts {
if strings.Contains(stderr, patchConflicts[i]) { if strings.Contains(stderr, patchConflicts[i]) {
log.Trace("PullRequest[%d].testPatch (apply): has conflit", pr.ID) log.Trace("PullRequest[%d].testPatch (apply): has conflict", pr.ID)
fmt.Println(stderr) fmt.Println(stderr)
pr.Status = PullRequestStatusConflict pr.Status = PullRequestStatusConflict
return nil return nil