From f3383daf608e371eeadf278df6231a2599a91017 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 21 Sep 2018 13:53:09 +0200 Subject: [PATCH] [IMP] runbot_merge: remove ref update while squashing/rebasing It should be unnecessary: creating commits directly does not update the ref (hence 2b1cd83b075a99da7ed905b9e62d7e5acb48b253) and we're forcefully setting the ref afterwards, either resetting it to the original head (for rebase) or updating it to the commits we've just created (for squash). --- runbot_merge/github.py | 1 - 1 file changed, 1 deletion(-) diff --git a/runbot_merge/github.py b/runbot_merge/github.py index 76314692..2554a28c 100644 --- a/runbot_merge/github.py +++ b/runbot_merge/github.py @@ -124,7 +124,6 @@ class GH(object): assert len(c['parents']) == 1, "can't rebase commits with more than one parent" tmp_msg = 'temp rebasing PR %s (%s)' % (pr, c['sha']) c['new_tree'] = self.merge(c['sha'], dest, tmp_msg)['tree']['sha'] - self.set_ref(dest, original_head) prev = original_head for c in commits: