chore: bump version and update CHANGELOG.md [skip ci]

bugfix: allow commits not compliant with conventional commits in changelog generation

Approved-by: Jonathan Teran

CHANGELOG.md

@@ -1,3 +1,31 @@
+## v1.17.5 - 2026-06-03
+
+- **bugfix**:  allow commits not compliant with conventional commits in changelog generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (3ff9f76)
+
+---
+
+
+## v1.17.4 - 2026-05-24
+
+- **bugfix**:  use rest of branch name instead of ticket for pr title generation [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (094bc1a)
+
+---
+
+
+## v1.17.3 - 2026-05-22
+
+- **bugfix**:  dont close branches on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (8ee0129)
+
+---
+
+
+## v1.17.2 - 2026-05-22
+
+- **bugfix**:  change pr title on merges between environments [[jteran](mailto:jteran@renatre.org.ar)] (de124ba)
+
+---
+
+
 ## v1.17.1 - 2026-05-20
 
 - **bugfix**:  dont push environment branches since they are already created on remote [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (04c9a4b)

src/git_flow/changelog.py

@@ -28,11 +28,15 @@ class Changelog:
             message = Git("show", commit, patch=False, format="%s").firstline()
             email = Git("show", commit, patch=False, format="%ae").firstline()
             username = email[: email.index("@")]
+            description = message
+
+            if ":" in message:
                 index = message.index(":")
                 commit_type = message[:index]
                 commit_message = message[index + 1 :]
+                description = f"**{commit_type}**: {commit_message}"
 
-            content += f"- **{commit_type}**: {commit_message} [[{username}](mailto:{email})] ({commit})\n"
+            content += f"- {description} [[{username}](mailto:{email})] ({commit})\n"
 
         return content
 

src/git_flow/command/merge.py

@@ -111,6 +111,7 @@ def create_pull_request(token: str, branch: str, target: str):
         target,
         title,
         changelog.generate_content(target, branch),
+        branch not in environments
     )
 
     success(message)
@@ -120,6 +121,10 @@ def create_pull_request(token: str, branch: str, target: str):
         Git("pull").exec(print="Obteniendo cambios")
 
 def _get_pr_title_from_branch(branch: str) -> str:
+    if branch in environments:
+        target = environments[environments.index(branch) + 1]
+        return f"Sincronización de entorno {branch} a {target}"
+
     components = branch.split("/") # <type>/<desc> or release/<env>/<type>/<desc>
     branch_type = components[-2]
     branch_desc = components[-1]
@@ -133,7 +138,7 @@ def _get_pr_title_from_branch(branch: str) -> str:
         maybe_ticket = branch_desc[:second_dash]
         if is_valid_ticket(maybe_ticket):
             branch_ticket = maybe_ticket
-            branch_desc = branch_desc[:second_dash+1]
+            branch_desc = branch_desc[second_dash+1:]
 
     return " ".join(filter(None, [
         f"[Pasaje a {components[1]}]" if len(components) == 4 else None,

src/git_flow/remote/base.py

@@ -56,6 +56,7 @@ class RemoteAPI(ABC):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
         pass
 

src/git_flow/remote/bitbucket.py

@@ -12,6 +12,7 @@ class BitbucketRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ):
         request = requests.post(
             self.get_endpoint("/pullrequests"),
@@ -21,7 +22,7 @@ class BitbucketRemoteAPI(RemoteAPI):
                 "description": description,
                 "source": {"branch": {"name": source}},
                 "destination": {"branch": {"name": destination}},
-                "close_source_branch": True,
+                "close_source_branch": close_source_branch,
             },
         )
 

src/git_flow/remote/github.py

@@ -11,6 +11,7 @@ class GithubRemoteAPI(RemoteAPI):
         destination: str,
         title: str | None = None,
         description: str | None = None,
+        close_source_branch: bool = True
     ) -> str:
         raise GitFlowError("not implemented yet!")