Fix freeze patch branching logic #1590
Merged
+21
−1
Conversation
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
The code that applies freeze patches assumed that the caller would always want to return to `main` afterwards. That assumption is only valid when curation runs against `main`, not when it runs as part of a pull request, or locally when preparing a pull request on a different branch. The new logic gets back to the right position, either a branch name if there's one, or a commit ID if contex is in "detached HEAD" mode.
Member
Author
|
Tests fail for an unrelated data curation reason. |
dontcallmedom
approved these changes
Jun 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The code that applies freeze patches assumed that the caller would always want to return to
mainafterwards. That assumption is only valid when curation runs againstmain, not when it runs as part of a pull request, or locally when preparing a pull request on a different branch.The new logic gets back to the right position, either a branch name if there's one, or a commit ID if contex is in "detached HEAD" mode.