50_prompt: Move VCS prompt styling into VCS plugin

[ax-zsh.git] / plugins / git / git.zshrc

diff --git a/plugins/git/git.zshrc b/plugins/git/git.zshrc
index 55c395f6b887caa0c74ae2e77c5681a334c4f028..4d796ef48a5590d67a8111fbbc8df5452dbff3b1 100644 (file)
--- a/plugins/git/git.zshrc
+++ b/plugins/git/git.zshrc
@@ -38,15 +38,18 @@ git_prompt_behind() {
 
 git_prompt_info() {
        local ref=$(git symbolic-ref HEAD 2>/dev/null) || return 1
-       echo "${ref#refs/heads/}"
+       [[ -n "$ref" ]] || return 1
+       echo "${ZSH_THEME_VCS_PROMPT_PREFIX}${ref#refs/heads/}${ZSH_THEME_VCS_PROMPT_SUFFIX}"
 }
 git_prompt_status() {
+       local ref=$(git symbolic-ref HEAD 2>/dev/null) || return 1
+       [[ -n "$ref" ]] || return 1
        echo "$(git_parse_dirty)$(git_prompt_ahead)$(git_prompt_behind)"
 }
 
 git_prompt() {
        local prompt=$(git_prompt_info)
-       [[ -n "$prompt" ]] || return 0
+       [[ -n "$prompt" ]] || return 1
        echo "$prompt$(git_prompt_status)"
        return 0
 }