Git: move current_branch() to core #4420
Merged
Conversation
This file contains 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
robbyrussell
added
git
Status: testers needed
| # it's not a symbolic ref, but in a Git repo. | ||
| function git_current_branch() { | ||
| local ref | ||
| ref=$(git symbolic-ref --quiet HEAD 2> /dev/null) |
There was a problem hiding this comment.
- That should be
command gitif you do not mind ;-) - Same on line 71.
There was a problem hiding this comment.
Don't mind at all. Amended.
apjanke
force-pushed
the
git-move-current_branch-to-core
branch
from
ffff1fd
to
e809c59
Compare
|
Added the |
|
Weird, it seems you re-pushed the exact same commit... maybe a bug with GitHub? |
apjanke
force-pushed
the
git-move-current_branch-to-core
branch
from
e809c59
to
4dc89aa
Compare
|
No, I must have screwed up somehow: the change to add the |
|
Then I vote for a merge ASAP! |
|
Ping... can we merge this? @mcornella |
|
Hi @apjanke, sorry for missing this one. I was going to merge but the commit message is leaking over multiple lines. Please edit that with a line break of separation between the subject and description of the commit. |
Fixes ohmyzsh#4085: core -> plugin dependency issue. Rename it to git_current_branch for clarity that it's git-specific. Update all plugins that were calling it to use new name. Fix variable leaks by making more variables in lib/git.zsh local. Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
apjanke
force-pushed
the
git-move-current_branch-to-core
branch
from
4dc89aa
to
9f55213
Compare
mcornella
added a commit
that referenced
this pull request
Dec 15, 2015
Git: move current_branch() to core
|
w00t |
nunogt
pushed a commit
to nunogt/oh-my-zsh
that referenced
this pull request
Jan 25, 2016
…to-core Git: move current_branch() to core
mcornella
removed
the
Status: testers needed
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.
Moves the
current_branch()function from thegitplugin to the corelib/git.zsh, since there are other functions in core OMZ or in themes that depend on it, and we don't want any core -> plugin dependencies.Fixes #4085
Fixes #4059
Fixes #331
Fixes #4581