Browse Source

Merge pull request #1477 from madsgraphics/git_prompt_showstashstate

Add Stash toogle to display if there's some stash or not in `git_prompt_status`
Robby Russell 12 years ago
parent
commit
d8162cdded
1 changed files with 4 additions and 1 deletions
  1. 4 1
      lib/git.zsh

+ 4 - 1
lib/git.zsh

@@ -85,6 +85,9 @@ git_prompt_status() {
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
   elif $(echo "$INDEX" | grep '^AD ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
     STATUS="$ZSH_THEME_GIT_PROMPT_DELETED$STATUS"
   fi
   fi
+  if $(git rev-parse --verify refs/stash >/dev/null 2>&1); then
+    STATUS="$ZSH_THEME_GIT_PROMPT_STASHED$STATUS"
+  fi
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
   if $(echo "$INDEX" | grep '^UU ' &> /dev/null); then
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
     STATUS="$ZSH_THEME_GIT_PROMPT_UNMERGED$STATUS"
   fi
   fi
@@ -102,7 +105,7 @@ git_prompt_status() {
 
 
 #compare the provided version of git to the version installed and on path
 #compare the provided version of git to the version installed and on path
 #prints 1 if input version <= installed version
 #prints 1 if input version <= installed version
-#prints -1 otherwise 
+#prints -1 otherwise
 function git_compare_version() {
 function git_compare_version() {
   local INPUT_GIT_VERSION=$1;
   local INPUT_GIT_VERSION=$1;
   local INSTALLED_GIT_VERSION
   local INSTALLED_GIT_VERSION