ez: fix prep -n with a fork-point specified

Fix logic when a fork-point is used with the default commit strategy.

Reported-by: Mark Brown <broonie@kernel.org>
Link: https://msgid.link/Y4+9Fz7lkzSnFV72@sirena.org.uk
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

1 files changed, 3 insertions, 1 deletions

diff --git a/b4/ez.py b/b4/ez.py
index 1e2321d..d9b7302 100644
--- a/b4/ez.py
+++ b/b4/ez.py
@@ -335,9 +335,11 @@ def start_new_series(cmdargs: argparse.Namespace) -> None:
                         logger.debug('branch %s does contain fork-point %s', mybranch, cmdargs.fork_point)
                         basebranch = mybranch
                         break
+            else:
+                basebranch = mybranch
 
             if basebranch is None:
-                logger.critical('CRITICAL: fork-point %s is not on the current branch.')
+                logger.critical('CRITICAL: fork-point %s is not on the current branch.', cmdargs.fork_point)
                 logger.critical('          Switch to the branch you want to use as base and try again.')
                 sys.exit(1)