# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 1594270832 -7200
# Node ID a0192a03216d6f0d279aa17312e946a06776875d
# Parent  07b3166e94ca72d66b8af2e8d36d707892582d07
rebase: remove now unnecessary logic to allow empty commit when branch changes

This was a workaround for a bug in the empty commit check in repo.commit(),
where the parent branch name was incorrectly compared with the wdir branch name
instead of the branch name passed via `extra`. The bug was fixed in D8724.

The workaround was introduced in b2415e94b2f5.

Differential Revision: https://phab.mercurial-scm.org/D8725

diff -r 07b3166e94ca -r a0192a03216d hgext/rebase.py
--- a/hgext/rebase.py	Fri Jul 10 00:44:18 2020 +0200
+++ b/hgext/rebase.py	Thu Jul 09 07:00:32 2020 +0200
@@ -529,11 +529,8 @@
         extra = {b'rebase_source': ctx.hex()}
         for c in self.extrafns:
             c(ctx, extra)
-        keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
         destphase = max(ctx.phase(), phases.draft)
         overrides = {(b'phases', b'new-commit'): destphase}
-        if keepbranch:
-            overrides[(b'ui', b'allowemptycommit')] = True
         with repo.ui.configoverride(overrides, b'rebase'):
             if self.inmemory:
                 newnode = commitmemorynode(