-
Notifications
You must be signed in to change notification settings - Fork 9
docs(security): recover OIDC review fixes dropped from #637's merge #654
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dawsontoth
wants to merge
2
commits into
main
Choose a base branch
from
claude/oidc-followup-fixes
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+17
−7
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This backport check cannot detect a selective cherry-pick: cherry-picking creates a new commit SHA, so
git branch -r --contains <original-main-sha>remains empty even when the feature is present on the release branch. That can incorrectly assign the next-minor badge to a backported feature. Please recommend inspecting the feature's files on the release branch/tag (as the preceding bullet does) or using patch-equivalence tooling such asgit log --cherryinstead of an ancestry check.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To make things funner, 1/3 of the time patch releases come from main, 2/3 of the time they come from a release branch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are right, and it breaks the bullet in the direction that matters: a cherry-pick creates a new SHA, so
git branch -r --contains <original-main-sha>stays empty even when the feature is sitting on the release branch — which would badge a back-ported feature as next-minor, the exact error that bullet exists to prevent.Rewritten in
f55789e9to ask whether the code is there rather than whether the commit is an ancestor, which is what the preceding bullet already does:git show <tag>:<path/to/feature/file>orgit ls-tree -r --name-only <tag> | grep <path>. Addedgit log --cherry-pick --left-right <tag>...mainfor when you need the commit rather than the file.The through-line I had missed: every ancestry-based shortcut in this area has a case that inverts it. File presence at the tag is the only test that survives all of them — which is also what settled the disputed badge on #637.
🤖 Addressed by Claude Code
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is worse than the version I had, and useful — thank you. My bullet asserted patch tags are cut from a release branch, full stop, which is wrong a third of the time and implies an empty
--containsreliably means "next minor".Fixed in
f55789e9: roughly a third come offmainand the rest off a release branch, so--containstells you nothing either way until you know which kind of cut that tag was. Combined with the cherry-pick point on the other thread, ancestry is out entirely — the guidance now sends you to check for the feature's files at the tag.Which is the more useful rule anyway: it does not require knowing how the release was cut, so it holds for all three cases.
🤖 Addressed by Claude Code