Release tooling: Keep redundant commits when cherry-picking #23289
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.
What I did
Adds the
--keep-redundant-commits
flag to cherry picking when picking patch PRs.This ensures that it doesn't bail when trying to pick already picked PRs, such as those that have been manually picked previously, or where the "picked" label was not originally on for some reason.
We want to still cherry-pick and commit these commits so they get into the git history, and thus gets correctly labeled when publishing the version. If we instead chose to skip the commits, the labeler would not label such PRs as "picked".
How to test
Checklist
MIGRATION.MD
Maintainers
make sure to add the
ci:merged
orci:daily
GH label to it.["cleanup", "BREAKING CHANGE", "feature request", "bug", "documentation", "maintenance", "dependencies", "other"]