diff options
| author | zeripath <art27@cantab.net> | 2021-12-31 12:33:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-31 20:33:55 +0800 |
| commit | 431e482e3f6f3736328ce4430c44fd58ab1c09d8 (patch) | |
| tree | 733d05542e9b566722719d005edfb3e72e2d70ce /services | |
| parent | 7eb380baa49e76e8fc396872f943b5396019a9bd (diff) | |
| download | gitea-431e482e3f6f3736328ce4430c44fd58ab1c09d8.tar.gz gitea-431e482e3f6f3736328ce4430c44fd58ab1c09d8.zip | |
Reset the conflicted files list in testpatch (#18139)
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>
Diffstat (limited to 'services')
| -rw-r--r-- | services/pull/patch.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/pull/patch.go b/services/pull/patch.go index 4bc875f630..0eba3f86ed 100644 --- a/services/pull/patch.go +++ b/services/pull/patch.go @@ -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 { |