Repository navigation
fix(release-candidate): reuse a hotfix branch at its tip - #50
Merged
Merged
Conversation
If release-vX.Y.Z already moved past base_commit, propose from the tip instead of failing or resetting. Skip the version bump when the file already reads the requested version.
Troublor
deleted the
mega-putin/fix/release-candidate-reuse-hotfix-tip
branch
September 30, 2026 01:37
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
When
base_commitis set andrelease-vX.Y.Zalready exists ahead of that commit (hotfix PRs merged), propose used to fail (branch already exists) or, on exact-SHA reuse,git checkout -Breset the job back tobase_commitand dropped those commits.Now:
base_commitor a descendant of it; sit on the tip.bump_command/ changelog (no empty candidate PR).base_commit, and refuse trunk-first when the branch already exists.Test plan
actions-test.yml: same-SHA reuse still works; different non-descendant still refused; descendant tip is checked outaction_docs.py --check