Comments
Patch
@@ -529,10 +529,12 @@
extra = {b'rebase_source': ctx.hex()}
for c in self.extrafns:
c(ctx, extra)
- keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch()
+ keepbranchchange = (
+ self.keepbranchesf and repo[p1].branch() != ctx.branch()
+ )
destphase = max(ctx.phase(), phases.draft)
overrides = {(b'phases', b'new-commit'): destphase}
- if keepbranch:
+ if keepbranchchange:
overrides[(b'ui', b'allowemptycommit')] = True
with repo.ui.configoverride(overrides, b'rebase'):
if self.inmemory: