0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-25 22:55:17 +01:00
gitea/services
zeripath 84f5a0bc62
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
2021-04-10 09:27:29 +01:00
..
archiver
comments
externalaccount
forms Add LFS Migration and Mirror (#14726) 2021-04-08 18:25:57 -04:00
gitdiff Add LFS Migration and Mirror (#14726) 2021-04-08 18:25:57 -04:00
issue
lfs Add LFS Migration and Mirror (#14726) 2021-04-08 18:25:57 -04:00
mailer
mirror Add LFS Migration and Mirror (#14726) 2021-04-08 18:25:57 -04:00
pull Always set the merge base used to merge the commit (#15352) 2021-04-10 09:27:29 +01:00
release
repository
webhook
wiki