1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-12 10:44:27 +00:00
zeripath 1fe5fe419e
Always set the merge base used to merge the commit (#15352) (#15385)
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
2021-04-10 14:08:30 +02:00
..
2021-01-28 19:08:11 +01:00
2021-03-16 00:20:05 +01:00
2020-04-05 07:20:50 +01:00
2020-10-02 23:37:53 -04:00
2018-11-04 22:20:00 -05:00
2019-06-12 15:41:28 -04:00
2021-02-03 22:36:38 +01:00
2021-02-05 22:41:45 +01:00
2020-04-05 07:20:50 +01:00
2021-01-26 16:36:53 +01:00
2021-04-06 18:44:24 +02:00