Merge pull request 'bugfix: check if merge commit already has a tag before tagging' (#55) from bugfix/check-merge-commit-tag into main

Reviewed-on: #55

.gitea/workflows/bump-build-publish.yaml

@@ -10,6 +10,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v7
+        with:
+          fetch-depth: 10
 
       - name: Configure git
         run: |
@@ -28,16 +30,16 @@ jobs:
       - name: Install git-flow and bump version
         id: version
         run: |
-          # pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}"
-          uv run git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
-          TAG=force
+          pip install git-flow-envs=="${{ vars.GITFLOWENVS_VERSION }}"
+          git-flow tag --token="${{ secrets.GITEA_TOKEN }}"
+          RESULT="$?"
 
-          if [ -z "$TAG" ]; then
+          if [ "$RESULT" -eq 0 ]; then
+            echo "New tag available."
+            echo "should_build=true" >> $GITHUB_OUTPUT
+          else
             echo "No new tag available, skipping next step."
             echo "should_build=false" >> $GITHUB_OUTPUT
-          else
-            echo "New tag available: $TAG."
-            echo "should_build=true" >> $GITHUB_OUTPUT
           fi
 
       - name: Build and publish

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.23.0 - 2026-09-21
+
+- **feature**:  add fetch depth [[jonathan.nerat](mailto:jonathan.nerat@gmail.com)] (68cec91)
+
+---
+
+
 ## v1.22.3 - 2026-09-21
 
 - **bugfix**:  tag locally for workflow to run [[jteran](mailto:jteran@renatre.org.ar)] (24a40c9)

src/git_flow/command/tag.py

@@ -16,22 +16,15 @@ app = typer.Typer()
 
 
 @app.command()
-def tag(token: str | None = None, update_changelog: bool = False):
+def tag(target: str | None = None, token: str | None = None, update_changelog: bool = False):
     """Crea un nuevo tag para el último merge."""
     base.ensure_initialized()
 
-    target = Git.get_current_branch()
+    target = target or Git.get_current_branch()
 
     if target not in base.environments:
         raise GitFlowError("Solo se pueden taggear commits en ramas principales.")
 
-    token, ci = get_token_and_ci(token)
-
-    if ci and not token:
-        raise GitFlowError("No hay token disponible")
-
-    Git("log", oneline=True, graph=True, max_count=20).exec(print="Listado de commits")
-
     merge_commit = Git(
         "log", first_parent=True, merges=True, max_count=1, format="%H"
     ).firstline()
@@ -39,6 +32,19 @@ def tag(token: str | None = None, update_changelog: bool = False):
     if not merge_commit:
         raise GitFlowError("No hay merges a taggear.")
 
+    merge_commit_tag = Git("tag", "--points-at", merge_commit).firstline()
+    if merge_commit_tag:
+        base.io_info(f"El último merge ya tiene un tag: {merge_commit_tag}")
+        return
+
+    # Con varios entornos cada uno versiona por separado (v1.0.0-prod), con uno solo no hace falta
+    suffix = f"-{target}" if len(base.environments) > 1 else ""
+
+    token, ci = get_token_and_ci(token)
+
+    if ci and not token:
+        raise GitFlowError("No hay token disponible")
+
     # Con varios entornos cada uno versiona por separado (v1.0.0-prod), con uno solo no hace falta
     suffix = f"-{target}" if len(base.environments) > 1 else ""
 
@@ -50,7 +56,7 @@ def tag(token: str | None = None, update_changelog: bool = False):
         current_tag = base.get_remote_api(token).get_latest_tag(suffix)
     else:
         # Commits se obtienen del último merge, listando hasta el primer forkpoint
-        branch = Git("show", merge_commit + "^2", patch=False, format="%h").firstline()
+        branch = Git("show", merge_commit + "^2", patch=False, format="%H").firstline()
         fork_point = Git.get_first_fork_point(branch, target)
         commits = Git.get_commits(fork_point, branch)
         # Último tag se obtiene localmente
@@ -60,8 +66,6 @@ def tag(token: str | None = None, update_changelog: bool = False):
         [c.subject for c in commits], suffix, current_tag
     )
 
-    base.io_info(f"Current tag: {current_tag}. Next tag: {next_tag}")
-
     if not next_tag:
         base.io_warning(
             "Los cambios realizados no implican un salto de versión, se mantiene la anterior."
@@ -78,7 +82,7 @@ def tag(token: str | None = None, update_changelog: bool = False):
         if ci:
             Git("push").exec()
 
-    tag_commit = Git("show", "HEAD", patch=False, format="%h").firstline()
+    tag_commit = Git("show", "HEAD", patch=False, format="%H").firstline()
 
     if ci:
         base.io_success(base.get_remote_api(token).create_tag(next_tag, tag_commit))

src/git_flow/remote/gitlab.py

@@ -46,7 +46,7 @@ class GitlabRemoteAPI(RemoteAPI):
         if response.ok:
             return "Tag creado exitosamente: " + tag
         else:
-            raise GitFlowError("Ocurrió un error al crear el tag para repositorio " + quote(self.repository, safe="") + ": " + response.text)
+            raise GitFlowError("Ocurrió un error al crear el tag: " + response.text)
 
     def get_merge_commits(self, merge_commit: str) -> list[Commit]:
         mrs = self.get_json(