From d74bafeeef29e6adf2be8c350d1ee5a2756aff09 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 2 Nov 2025 15:46:56 -0300 Subject: [PATCH 1/2] feature: agrego soporte para tag de merge de ramas release --- git-flow | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-flow b/git-flow index b34c31e..ca72cde 100755 --- a/git-flow +++ b/git-flow @@ -357,8 +357,16 @@ def tag_command(): until_dash = last_version.index("-") if "-" in last_version else None [major, minor, patch] = map(int, last_version[from_major:until_dash].split(".")) - merged_branch_type = merged_branch[:merged_branch.index('/')] if '/' in merged_branch else merged_branch - increment = BRANCH_TYPES_INCREMENT[merged_branch_type] + components = merged_branch.split("/") + + if len(components) not in [2, 4]: + raise RuntimeError("Branch mergeado es inválido: " + merged_branch) + elif len(components) == 4 and components[0] != "release": + raise RuntimeError("Release branch mergeado es inválido: " + merged_branch) + elif components[-2] not in BRANCH_TYPES: + raise RuntimeError("Tipo de rama mergeado es inválido: " + components[-2]) + + increment = BRANCH_TYPES_INCREMENT[components[-2]] if increment == "major": major = major + 1 From 715f6ef597c37c1679244333e72f98e3e4f803c7 Mon Sep 17 00:00:00 2001 From: Jonathan Teran Carballo Date: Sun, 2 Nov 2025 15:47:07 -0300 Subject: [PATCH 2/2] Updated CHANGELOG.md --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3503387..a026454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## Domingo, 2 de Noviembre de 2025, 15:47 + +- Autor: [Jonathan Teran Carballo](mailto:jonathan.nerat@gmail.com) +- Rama: `feature/add-release-tag-support` + +### Commits + +- **feature**: agrego soporte para tag de merge de ramas release (d74bafe) + - git-flow (M) + +--- + ## Domingo, 2 de Noviembre de 2025, 15:32 - Autor: [Jonathan Teran Carballo](mailto:jonathan.nerat@gmail.com)