GIT_PROMPT_IGNORE_STASH was broken. Fixes #106

magicmonty · Jan 3, 2015 · c0510cf · c0510cf · tfe · Jan 4, 2015
1 parent 62d95d5
commit c0510cf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/gitprompt.sh b/gitprompt.sh
@@ -378,6 +378,7 @@ function updatePrompt() {
 
   git_prompt_config
 
+  export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH}
   local -a GitStatus
   GitStatus=($("$__GIT_STATUS_CMD" 2>/dev/null))
 

diff --git a/gitstatus.sh b/gitstatus.sh
@@ -39,7 +39,7 @@ num_changed=$(( `all_lines "$gitstatus"` - `count_lines "$gitstatus" U` ))
 num_conflicts=`count_lines "$staged_files" U`
 num_staged=$(( `all_lines "$staged_files"` - num_conflicts ))
 num_untracked=`git ls-files --others --exclude-standard | wc -l`
-if [[ -n "$GIT_PROMPT_IGNORE_STASH" ]]; then
+if [[ "$__GIT_PROMPT_IGNORE_STASH" = "1" ]]; then
   num_stashed=0
 else	
   num_stashed=`git stash list | wc -l`