diff options
| author | zeripath <art27@cantab.net> | 2020-02-09 23:09:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 01:09:31 +0200 |
| commit | 875c5e13050e4f7b95773c3b8ef5deac8b4b581b (patch) | |
| tree | 226be9ed66641915fb4d3c623e423c3c87bcd3a0 /services/pull/update.go | |
| parent | 585316f3bf567f8714054babab91280afdaa332b (diff) | |
| download | gitea-875c5e13050e4f7b95773c3b8ef5deac8b4b581b.tar.gz gitea-875c5e13050e4f7b95773c3b8ef5deac8b4b581b.zip | |
Only check for conflicts/merging if the PR has not been merged in the interim (#10132)
* Only check for merging if the PR has not been merged in the interim
* fixup! Only check for merging if the PR has not been merged in the interim
* Try to fix test failure
* Use PR2 not PR1 in tests as PR1 merges automatically
* return already merged error
* enforce locking
* enforce locking - fix-test
* enforce locking - fix-testx2
* enforce locking - fix-testx3
* move pullrequest checking to after merge
This might improve the chance that the race does not affect us but does not prevent it.
* Remove minor race with getting merge commit id
* fixup
* move check pr after merge
* Remove unnecessary prepareTestEnv - onGiteaRun does this for us
* Add information about when merging occuring
* fix fmt
* More logging
* Attempt to fix mysql
* Try MySQL fix again
* try again
* Try again?!
* Try again?!
* Sigh
* remove the count - perhaps that will help
* next remove the update id
* next remove the update id - make it updated_unix instead
* On failure to merge ensure that the pr is rechecked for conflict errors
* On failure to merge ensure that the pr is rechecked for conflict errors
* Update models/pull.go
* Update models/pull.go
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
* Apply suggestions from code review
Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'services/pull/update.go')
| -rw-r--r-- | services/pull/update.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/pull/update.go b/services/pull/update.go index 5f055827e1..66921abefa 100644 --- a/services/pull/update.go +++ b/services/pull/update.go @@ -39,11 +39,13 @@ func Update(pull *models.PullRequest, doer *models.User, message string) error { return fmt.Errorf("HeadBranch of PR %d is up to date", pull.Index) } + _, err = rawMerge(pr, doer, models.MergeStyleMerge, message) + defer func() { go AddTestPullRequestTask(doer, pr.HeadRepo.ID, pr.HeadBranch, false, "", "") }() - return rawMerge(pr, doer, models.MergeStyleMerge, message) + return err } // IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections |