feat: better resilience against listing already included cherry-picks #101
Conversation
There was a problem hiding this comment.
Pull request overview
This PR adds resilience to the cherry-pick process by detecting and skipping commits that have already been applied to the current branch. This prevents failures when cherry-picks are re-listed and improves the user experience by clearly indicating which cherry-picks can be safely dropped.
Key Changes:
- Adds ancestor checking before applying cherry-picks to prevent duplicate application
- Provides informative console output for skipped commits
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
|
This works as intended when cherry-picked into #35, see e.g. https://github.com/eic/containers/actions/runs/20508969170/job/58927593032#step:14:685 |
Briefly, what does this PR introduce?
This PR is a quality-of-life improvement in advance of #35. It is always a bit annoying to figure out which of the cherry-picks need to be retained. This PR will print the ones that can be dropped, but more importantly it won't fail on them when cherry-pick wants to apply them again (since they will be skipped).