From 14beea150de16e06f7b4e54361584dae5d5ae713 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Fri, 7 Nov 2025 21:26:59 -0300 Subject: [PATCH] bugfix: cambio el commit que se usa para generar las entradas del changelog --- src/git_flow/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/git_flow/main.py b/src/git_flow/main.py index 258e6c7..effc213 100755 --- a/src/git_flow/main.py +++ b/src/git_flow/main.py @@ -404,7 +404,8 @@ def tag_command(): [service, repository] = parse_url(url) create_tag(service, repository, token, new_version, commit) - if update_changelog(merged_branch, branch): + merged_commit = Git("show", "HEAD^2", patch=False, format="%H").firstline() + if update_changelog(merged_commit, branch): Git("add", Git.CHANGELOG_FILE).exec() Git("commit", message=Git.BUMP_VERSION).exec() Git("push").exec()