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/gallois.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/gallois.zsh-theme')
| -rw-r--r-- | themes/gallois.zsh-theme | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme index d383ed583..515325e38 100644 --- a/themes/gallois.zsh-theme +++ b/themes/gallois.zsh-theme @@ -1,3 +1,5 @@ +# Depends on the git plugin for work_in_progress() + ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}[" ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" @@ -5,9 +7,9 @@ ZSH_THEME_GIT_PROMPT_CLEAN="" #Customized git status, oh-my-zsh currently does not allow render dirty status before branch git_custom_status() { - local cb=$(current_branch) + local cb=$(git_current_branch) if [ -n "$cb" ]; then - echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$(parse_git_dirty)%{$fg_bold[yellow]%}$(work_in_progress)%{$reset_color%}$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX" fi } |