jt/git-flow
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: renombro variable UPDATED_CHANGELOG_FILE a BUMP_VERSION

Browse Source
This commit is contained in:
jt
2025-11-07 21:05:33 -03:00
parent 10c1d54c2d
commit 6d390376d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/git_flow/main.py
+4 -4
View File
@@ -257,7 +257,7 @@ def merge_command():
print("Cambios a mergear:") print("Cambios a mergear:")
for commit in commits: for commit in commits:
if commit != Git.UPDATED_CHANGELOG_MSG: if commit != Git.BUMP_VERSION:
print("- " + commit) print("- " + commit)
merge_conflicts = Git("merge", target, ff=False, commit=False).exec() merge_conflicts = Git("merge", target, ff=False, commit=False).exec()
@@ -406,7 +406,7 @@ def tag_command():
if update_changelog(merged_branch, branch): if update_changelog(merged_branch, branch):
Git("add", Git.CHANGELOG_FILE).exec() Git("add", Git.CHANGELOG_FILE).exec()
Git("commit", message=Git.UPDATED_CHANGELOG_MSG).exec() Git("commit", message=Git.BUMP_VERSION).exec()
Git("push").exec() Git("push").exec()
else: else:
Git("tag", new_version, commit).exec() Git("tag", new_version, commit).exec()
@@ -523,7 +523,7 @@ def get_unique_branch_name(branch_type):
def update_changelog(branch: str, target: str): def update_changelog(branch: str, target: str):
last_commit = Git("show", "HEAD", no_patch=True, format="%s").firstline() last_commit = Git("show", "HEAD", no_patch=True, format="%s").firstline()
if last_commit == Git.UPDATED_CHANGELOG_MSG: if last_commit == Git.BUMP_VERSION:
return False return False
else: else:
content = generate_changelog_entry(branch, target) content = generate_changelog_entry(branch, target)
@@ -568,7 +568,7 @@ def get_changelog_content_lines(branch: str, target: str):
email = Git("show", commit, patch=False, format="%ae").firstline() email = Git("show", commit, patch=False, format="%ae").firstline()
username = email[:email.index('@')] username = email[:email.index('@')]
if message == Git.UPDATED_CHANGELOG_MSG: if message == Git.BUMP_VERSION:
continue continue
index = message.index(":") index = message.index(":")