diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-06-25 15:04:01 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-12-14 20:28:37 -0500 |
| commit | 9f552130bd0c390420a51bbfd2933c065a1581d0 (patch) | |
| tree | 7ce74d24f825e184508ed0872a3899104e60cfc4 /themes/mortalscumbag.zsh-theme | |
| parent | bfd2d8de24fc1ac9663f77a2fdffe40a403eefb7 (diff) | |
| download | zsh-9f552130bd0c390420a51bbfd2933c065a1581d0.tar.gz zsh-9f552130bd0c390420a51bbfd2933c065a1581d0.tar.bz2 zsh-9f552130bd0c390420a51bbfd2933c065a1581d0.zip | |
Move current_branch() from git plugin to core lib/git.zsh
Fixes #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.
Diffstat (limited to 'themes/mortalscumbag.zsh-theme')
| -rw-r--r-- | themes/mortalscumbag.zsh-theme | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/themes/mortalscumbag.zsh-theme b/themes/mortalscumbag.zsh-theme index ccce4197a..55ece9760 100644 --- a/themes/mortalscumbag.zsh-theme +++ b/themes/mortalscumbag.zsh-theme @@ -5,7 +5,7 @@ function my_git_prompt() { STATUS="" # is branch ahead? - if $(echo "$(git log origin/$(current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then + if $(echo "$(git log origin/$(git_current_branch)..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD" fi @@ -37,7 +37,7 @@ function my_git_prompt() { } function my_current_branch() { - echo $(current_branch || echo "(no branch)") + echo $(git_current_branch || echo "(no branch)") } function ssh_connection() { |