From 2b1cd83b075a99da7ed905b9e62d7e5acb48b253 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 20 Sep 2018 10:08:08 +0200 Subject: [PATCH] [FIX] runbot_merge: forcefully update dest after non-reset rebase --- runbot_merge/github.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runbot_merge/github.py b/runbot_merge/github.py index 2190b09f..7e52cf17 100644 --- a/runbot_merge/github.py +++ b/runbot_merge/github.py @@ -139,6 +139,8 @@ class GH(object): if reset: self.set_ref(dest, original_head) + else: + self.set_ref(dest, prev) _logger.debug('%s, %s, %s, reset=%s, commits=%s) -> %s', self._repo, pr, dest, reset, commits and len(commits),