bugfix: arreglo mensaje de confirmacion de squash, muevo prompt de commit message antes del squash
This commit is contained in:
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user