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 |
||
---|---|---|
.. | ||
analyze | ||
auth | ||
avatar | ||
base | ||
cache | ||
charset | ||
context | ||
convert | ||
cron | ||
csv | ||
doctor | ||
emoji | ||
eventsource | ||
generate | ||
git | ||
gitgraph | ||
graceful | ||
hcaptcha | ||
highlight | ||
httpcache | ||
httplib | ||
indexer | ||
lfs | ||
log | ||
markup | ||
matchlist | ||
metrics | ||
migrations | ||
nosql | ||
notification | ||
options | ||
password | ||
pprof | ||
private | ||
process | ||
public | ||
queue | ||
recaptcha | ||
references | ||
repofiles | ||
repository | ||
secret | ||
session | ||
setting | ||
ssh | ||
storage | ||
structs | ||
svg | ||
sync | ||
task | ||
templates | ||
test | ||
timeutil | ||
translation | ||
upload | ||
uri | ||
user | ||
util | ||
validation | ||
web |