mirror of
https://github.com/go-gitea/gitea
synced 2024-11-15 22:54:24 +00:00
1fe5fe419e
Backport #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 |
||
---|---|---|
.. | ||
archiver | ||
comments | ||
externalaccount | ||
gitdiff | ||
issue | ||
mailer | ||
mirror | ||
pull | ||
release | ||
repository | ||
webhook | ||
wiki |