Skip to content

Commit

Permalink
Reset the conflicted files list in testpatch (go-gitea#18139)
Browse files Browse the repository at this point in the history
Although go-gitea#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>
  • Loading branch information
zeripath authored and Stelios Malathouras committed Mar 28, 2022
1 parent 141a470 commit bd8f8b8
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions services/pull/patch.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ func checkConflicts(pr *models.PullRequest, gitRepo *git.Repository, tmpBasePath
}()

numberOfConflicts := 0
pr.ConflictedFiles = make([]string, 0, 5)
conflict := false

for file := range unmerged {
Expand Down

0 comments on commit bd8f8b8

Please sign in to comment.