aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-11-04 08:17:24 -05:00
Code

Reset the conflicted files list in testpatch (#18139)

Browse Source 
Although #18004 will seriously reduce the likelihood of finding
conflicts in the first place - one bug was introduced whereby the
conflicted files status was not being reset properly. This leads to
conflicted PRs remaining conflicted when the conflict has been resolved.

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-12-31 12:33:55 +00:00 committed by GitHub
parent 7eb380baa4
commit 431e482e3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/pull/patch.go
View File

@ -235,6 +235,7 @@ func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath
}() }()
numberOfConflicts := 0 numberOfConflicts := 0
pr.ConflictedFiles = make([]string, 0, 5)
conflict := false conflict := false
for file := range unmerged { for file := range unmerged {