diff --git a/src/git_flow/main.py b/src/git_flow/main.py index 5283a27..3e91884 100755 --- a/src/git_flow/main.py +++ b/src/git_flow/main.py @@ -398,7 +398,9 @@ def tag_command(): elif increment == "patch": patch = patch + 1 - new_version = f"v{major}.{minor}.{patch}-{branch}" + last_branch = Git.flow_config("flow.branches").firstline().split(" ")[-1] + suffix = "-" + branch if branch != last_branch else "" + new_version = f"v{major}.{minor}.{patch}" + suffix if ci: url = Git("remote", "get-url", remote).firstline()