opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-05-28 21:41:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set correct PR status on 3way on conflict checking (#19457)

Browse Source 
* Set correct PR status on 3way on conflict checking

- When 3-way merge is enabled for conflict checking, it has a new
interesting behavior that it doesn't return any error when it found a
conflict, so we change the condition to not check for the error, but
instead check if conflictedfiles is populated, this fixes a issue
whereby PR status wasn't correctly on conflicted PR's.
- Refactor the mergeable property(which was incorrectly set and lead me this
bug) to be more maintainable.
- Add a dedicated test for conflicting checking, so it should prevent
future issues with this.

* Fix linter
This commit is contained in:
Gusted
2022-04-21 21:55:45 +00:00
committed by GitHub
parent 3ec1b6c223
commit ebe569a268
4 changed files with 89 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/pull/patch.go
View File

@ -444,14 +444,16 @@ func checkConflicts(ctx context.Context, pr *models.PullRequest, gitRepo *git.Re
},
})
// 9. If there is a conflict the `git apply` command will return a non-zero error code - so there will be a positive error.
if err != nil {
// 9. Check if the found conflictedfiles is non-zero, "err" could be non-nil, so we should ignore it if we found conflicts.
// Note: `"err" could be non-nil` is due that if enable 3-way merge, it doesn't return any error on found conflicts.
if len(pr.ConflictedFiles) > 0 {
if conflict {
pr.Status = models.PullRequestStatusConflict
log.Trace("Found %d files conflicted: %v", len(pr.ConflictedFiles), pr.ConflictedFiles)
return true, nil
}
} else if err != nil {
return false, fmt.Errorf("git apply --check: %v", err)
}
return false, nil