NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: forcefully update dest after non-reset rebase

Browse Source
This commit is contained in:
Xavier Morel 2018-09-20 10:08:08 +02:00
parent 3d8add9c11
commit 2b1cd83b07
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/github.py
View File

@ -139,6 +139,8 @@ class GH(object):
if reset: if reset:
self.set_ref(dest, original_head) self.set_ref(dest, original_head)
else:
self.set_ref(dest, prev)
_logger.debug('%s, %s, %s, reset=%s, commits=%s) -> %s', _logger.debug('%s, %s, %s, reset=%s, commits=%s) -> %s',
self._repo, pr, dest, reset, commits and len(commits), self._repo, pr, dest, reset, commits and len(commits),