Merge branch 'jk/prompt-stash-could-be-packed' into maint

* jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR
git-mirror · Sep 19, 2014 · 8ec959f · 8ec959f
2 parents 92ea1ac + 0fa7f01
commit 8ec959f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -468,7 +468,8 @@ __git_ps1 ()
 			fi
 		fi
 		if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
-		   [ -r "$g/refs/stash" ]; then
+		   git rev-parse --verify --quiet refs/stash >/dev/null
+		then
 			s="$"
 		fi