Lots of branch-cleanup work #203
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaymzh
force-pushed
the
remote-cleanup
branch
from
b2bff12 to
c6cf7fc
Compare
jaymzh
force-pushed
the
remote-cleanup
branch
from
c6cf7fc to
36bcc52
Compare
Owner
Author
|
Also, I'd love @kinkie to test out the new remote-branch commands here. |
jaymzh
force-pushed
the
remote-cleanup
branch
from
36bcc52 to
4e0579d
Compare
The cleanup logic has gotten messed up at some point, so bclean{all},
always checked what the _current_ branch was tracking instead of what
the branch-to-be-cleaned was tracking. Fortunately, this almost
certainly lead to lost of false-negatives instead of false-positives,
but it's still a bummer. This fixes tha.
In addition this adds some new commands for cleaning up remote branches
in addition to local branches: {r,s}eclean{,all}
* `rclean` / `remoteclean` - `bclean` but for remote branches
* `remotecleanall` / `rcleanall` - `bcleanall` but for remote branches
* `superclean` / `sclean` - calls both `bclean` and `rclean`
* `supercleanall` / `scleanall` - calls both `bcleanall` and `rcleanall`
I do *not* love the naming here. What I'm considering instead:
* `localbranchclean` / `lbclean` - local branch clean. aliased as
`bclean` for back-comat
* `localbranchcleanall` / `lbcleanall` - local all branch clean aliased
as `bclean` for back-compat
* `remotebranchclean` / `rbclean` - remote branch clean
* `remotebranchcleanall` / `rbcleanall` - remote all branch clean
* `globalbranchclean` / `gbclean` - local+remote branch clean
* `globalbranchcleanall` / `gbcleanall` - local+remote all branch clean
I'm curious what @kinkie and @zealws think....
Closes #199
Signed-off-by: Phil Dibowitz <phil@ipom.com>
jaymzh
force-pushed
the
remote-cleanup
branch
from
4e0579d to
6dff50f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The cleanup logic has gotten messed up at some point, so bclean{all},
always checked what the current branch was tracking instead of what
the branch-to-be-cleaned was tracking. Fortunately, this almost
certainly lead to lost of false-negatives instead of false-positives,
but it's still a bummer. This fixes tha.
In addition this adds some new commands for cleaning up remote branches
in addition to local branches: {r,s}eclean{,all}
rclean/remoteclean-bcleanbut for remote branchesremotecleanall/rcleanall-bcleanallbut for remote branchessuperclean/sclean- calls bothbcleanandrcleansupercleanall/scleanall- calls bothbcleanallandrcleanallI do not love the naming here. What I'm considering instead:
localbranchclean/lbclean- local branch clean. aliased asbcleanforback-comat
localbranchcleanall/lbcleanall- local all branch clean aliased asbcleanfor back-compat
remotebranchclean/rbclean- remote branch cleanremotebranchcleanall/rbcleanall- remote all branch cleanglobalbranchclean/gbclean- local+remote branch cleanglobalbranchcleanall/gbcleanall- local+remote all branch cleanI'm curious what @kinkie and @zealws think....
Closes #199
Signed-off-by: Phil Dibowitz phil@ipom.com