diff --git a/src/git_flow/main.py b/src/git_flow/main.py index cb06bb4..4e72f84 100755 --- a/src/git_flow/main.py +++ b/src/git_flow/main.py @@ -257,7 +257,7 @@ def merge_command(): print("Cambios a mergear:") for commit in commits: - if commit != Git.UPDATED_CHANGELOG_MSG: + if commit != Git.BUMP_VERSION: print("- " + commit) merge_conflicts = Git("merge", target, ff=False, commit=False).exec() @@ -406,7 +406,7 @@ def tag_command(): if update_changelog(merged_branch, branch): Git("add", Git.CHANGELOG_FILE).exec() - Git("commit", message=Git.UPDATED_CHANGELOG_MSG).exec() + Git("commit", message=Git.BUMP_VERSION).exec() Git("push").exec() else: Git("tag", new_version, commit).exec() @@ -523,7 +523,7 @@ def get_unique_branch_name(branch_type): def update_changelog(branch: str, target: str): 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 else: 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() username = email[:email.index('@')] - if message == Git.UPDATED_CHANGELOG_MSG: + if message == Git.BUMP_VERSION: continue index = message.index(":")