Skip to content
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

Update cherry-pick to skip empty commits #5

Open
RebelLion420 opened this issue May 28, 2020 · 2 comments
Open

Update cherry-pick to skip empty commits #5

RebelLion420 opened this issue May 28, 2020 · 2 comments

Comments

@RebelLion420
Copy link

I love using this script when i need to but the biggest downfall is the manual intervention for cherry-picking empty commits. I looked into it a bit and it seems theres a fairly simple solution that takes advantage of git rev-list. Something like this:

git rev-list --reverse v3.18.139..v3.18.140 . | git cherry-pick --stdin

I have tested it in place of your cherry-pick case statement and it seems to work without a hitch. If you decide to implement it would just make the workflow that much smoother.

@nathanchance
Copy link
Member

Do the commits get picked as empty commits then or are they ignored?

@RebelLion420
Copy link
Author

They are then ignored, similar to a git cherry-pick --skip when an empty commit is picked. I can try other situations, but as far as upstreaming goes it does the job

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants