Repository navigation
fix(release): avoid post-merge ancestry race - #128
Merged
Merged
Conversation
Signed-off-by: Vitor Mattos <1079143+vitormattos@users.noreply.github.com>
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.
Fix a race observed while finalizing LibreSign 15.0.7.
The first post-merge attempt failed with:
fatal: Not a valid commit name 8954ab3bdcd3b3ca785f039d89cd35b1b347a1e4That SHA was a valid merge commit created on
stable35by the previous release history synchronization while the 15.0.7 finalization job was already running. GitHub's API returned the new branch head, but the local checkout had been fetched just before that commit existed.Ancestry validation of a live remote branch should therefore not depend on the local clone containing the latest remote head. This change validates the final release commit against the observed GitHub branch head through the GitHub compare API instead.
It keeps the safety check: diverged history is still rejected, while a branch that advanced after the release merge is accepted when the release commit remains its ancestor.