From f1f6e6724c06ad07c2e623d3026d91fd004e5433 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sat, 29 Nov 2025 13:40:34 -0300 Subject: [PATCH] bugfix: arreglo mensaje de confirmacion de squash, muevo prompt de commit message antes del squash --- src/git_flow/command/release.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/git_flow/command/release.py b/src/git_flow/command/release.py index e3f7158..2605441 100644 --- a/src/git_flow/command/release.py +++ b/src/git_flow/command/release.py @@ -59,20 +59,23 @@ class ReleaseCommand(Command): commits = int(Git("rev-list", base + "..", count=True).firstline()) if commits > 1 and self.confirm( - "Desea reemplazar los {commits} commits de la rama por uno solo?" + f"¿Desea reemplazar los {commits} commits de la rama por uno solo?", + False ): - Git("switch", next_branch, base, create=True).exec( - print="Creando rama release en base" - ) - Git("merge", branch, squash=True).exec( - print="Squasheando commits en uno solo" - ) + self.info("Debe ingresar el mensaje del commit a crear.") commit_type = self.choice("Tipo de commit", COMMIT_TYPES[:-1]) commit_message = self.prompt( "Mensaje (máximo recomendado: 100 caracteres)", persistent=True ) message = commit_type + ": " + commit_message + + Git("switch", next_branch, base, create=True).exec( + print="Creando rama release en base" + ) + Git("merge", branch, squash=True).exec( + print="Squasheando commits en uno solo" + ) Git("commit", m=message).exec(print="Creando commit único") else: Git("switch", next_branch, create=True).exec(print="Creando rama release")