mirror of https://github.com/go-gitea/gitea.git
commit
31950cb262
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue