]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e375cbf) | patch
Always set the merge base used to merge the commit (#15352)
authorzeripath <art27@cantab.net>
Sat, 10 Apr 2021 08:27:29 +0000 (09:27 +0100)
committerGitHub <noreply@github.com>
Sat, 10 Apr 2021 08:27:29 +0000 (09:27 +0100)
commit84f5a0bc62568b6d0a67969e460f4d41339a07d6
tree482b1254ec65ad3c1c001d4e9229c309a7ad7cf9tree | snapshot
parente375cbfd464e12a704c3c1325315a0381ab877a7commit | diff
Always set the merge base used to merge the commit (#15352)

The issue is that the TestPatch will reset the PR MergeBase - and it is possible for TestPatch to update the MergeBase whilst a merge is ongoing. The ensuing merge will then complete but it doesn't re-set the MergeBase it used to merge the PR.

Fixes the intermittent error in git test.

Signed-off-by: Andrew Thornton art27@cantab.net
integrations/api_helper_for_declarative_test.go diff | blob | history
integrations/git_test.go diff | blob | history
models/pull.go diff | blob | history
modules/queue/manager.go diff | blob | history
services/pull/merge.go diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea