-
-
Notifications
You must be signed in to change notification settings - Fork 25.8k
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
Fix parse_git_dirty() when status.branch is set. #2928
Conversation
Seems legit to me, but needs a bit more testing before I pull it into #2790 — by the way, please send your git plugin PRs directly to me instead of upstream, it allows me to cleanly aggregate them. @mcornella @kipanshi @Kriechi can you please have a look? |
Basically this PR does 3 things:
The cleanup is correct and doesn't need testing, but the other 2 do need testing. I'll Also, notice that this modifies |
Thanks for comments, guys. Sorry for mixing a bit too much in here (PR title should be "Fixes for parse_git_dirty()"?) @mcornella : You are saying this is merging to the correct place? I did assume |
Closing in favor of #2386, which I can start testing with (and get mergable) |
Reopening on @mcornella's recommendation in #3127 (and this is the last time I open a PR from master 😦) |
/cc @robbyrussell: works perfectly and solves #3126 |
Looks good to me! 👍 |
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Commit 81004df reverted the change in 9b811fb when editing the merge conflict from ohmyzsh#2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
Also some cleanups.