From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 21:05:11 +0000 (-0700)
Subject: Merge branch 'jk/prompt-stash-could-be-packed' into maint
X-Git-Tag: v2.1.1~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ec959fbcec5f12925eb0a4a60e789a818fdccb9?hp=92ea1ac8267a14f4eae55f175ac7ff0aeaaddc89

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
---

diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 9d684b10a6..c5473dc8db 100644
--- 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