-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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
check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches #303211
check-cherry-picks.sh maintainer script: fix handling of cherry-pick-less branches #303211
Conversation
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.
I made #303192 but I'm not sure which way we should prefer.
Do we still need the condition L31?
…ding differences found
Successfully created backport PR for |
Git push to origin failed for release-23.11 with exitcode 1 |
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-23.11
git worktree add -d .worktree/backport-303211-to-release-23.11 origin/release-23.11
cd .worktree/backport-303211-to-release-23.11
git switch --create backport-303211-to-release-23.11
git cherry-pick -x b612366abc32edc61e86d0fcc0f4a08cabcf5212 dc4f2184327d7b04edda404fa8562ba5e3e17755 |
1 similar comment
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-23.11
git worktree add -d .worktree/backport-303211-to-release-23.11 origin/release-23.11
cd .worktree/backport-303211-to-release-23.11
git switch --create backport-303211-to-release-23.11
git cherry-pick -x b612366abc32edc61e86d0fcc0f4a08cabcf5212 dc4f2184327d7b04edda404fa8562ba5e3e17755 |
Description of changes
PRs with no commits mentioning cherry-picks will produce an empty output from the git command. This behaviour will have changed when I chose a different iteration approach shortly before merging 😿
This should fix situations like #303093
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.