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

22 KiB

Raw Blame History

View Raw