-
Notifications
You must be signed in to change notification settings - Fork 13
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
Adding the git_branching option #324
base: master
Are you sure you want to change the base?
Conversation
I think what you propose here is a much better solution as the default behavior of |
ad96c90
to
07e515e
Compare
464515b
to
936735b
Compare
I've been using this since Pulpcore 3.21 branching, it worked as intended |
The thing missing for me here is that it removes the auto-creation of a branch for me which I have used a lot. I was hoping with this change you could keep that functionality but put it behind a parameter, e.g. |
8e6cf91
to
e18a7ab
Compare
…nch for every commit. Adds --branch for the old --commit logic.
-h, --help show this help message and exit | ||
-v, --verbose verbose output | ||
--branch When true, creates a git branch and commits the update changes to it. |
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.
--branch When true, creates a git branch and commits the update changes to it. | |
--branch When true, creates a git branch. |
--commit
does the second half?
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.
No --commit only commits the package update, it does not create a new branch it can be used in a loop and it will only generate news commits and not new branches
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.
Ohh that's a bit confusing, I would expect:
- branch to create me a branch
- commit to create a commit
- branch + commit to create a new branch and commit
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.
Yeah that's confusing, and I was confused. I'll refactor the code later today.
This will be used for pulpcore branching, the --commit make it hard to push/sync during branching, when we have at least 25+ package updates.
For this I'm adding a
--branching
to keep all commits in the same branch