-
-
Notifications
You must be signed in to change notification settings - Fork 40
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
Allow passing a base branch that doesn't have version info #70
base: main
Are you sure you want to change the base?
Conversation
I think this change is reasonable. |
Tests are currently failing on main and so this PR is affected, I fixed them in #76. |
I think allowing it to be configured via the toml file is a good idea as well. Would you be able to add that in a separate PR? |
I can do it here or in a separate PR, whatever you prefer. Can probably get to it tomorrow. I assume you would want this to be a true/false setting determining whether branches without version info are allowed (defaulting to false to keep the current behavior intact)? |
I think it should support the original behavior if not supplied. |
Alright, I added a While looking into this, I also realized that I suggested adding such an option in the PR's description which I didn't really realize when you asked me to add it 😄 |
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
I created python/miss-islington#639 to make miss-islington work with this PR since I realized that this is going to be necessary now that this also adds a new configuration option. |
I addressed the review and resolved the merge conflicts. Seems like I may have missed the merge window for the release though 😄 If by the time this is looked at by a maintainer new conflicts arise, just let me know and I'll resolve them - maybe I'll finally be able to use upstream directly :) |
@hugovk mind taking a look? |
Resolves #69
I could add enforcement of something here if this is too lax but I'm not sure what kind of check that could be. I suppose I could also add an option to
.cherry_picker.toml
that needs to be explicitly enabled to allow passing non-version branches if that makes it any better.I'm aware this issue wasn't accepted but I kinda felt like doing it anyway, even if it doesn't end up merged :P