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(