summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:08 (GMT)
commit64014894cfd29114a6b60cc501f06a68b5f3606b (patch)
treeb1a9c1fe4fc1d3708a5dd4dac9ea4b5cf23a3042 /contrib
parent3ef87bd8729f17b8b10236c432f41fb86605daa9 (diff)
parent0fa7f01635aa0356823d5cbb5109f61b0f307e4b (diff)
downloadgit-64014894cfd29114a6b60cc501f06a68b5f3606b.zip
git-64014894cfd29114a6b60cc501f06a68b5f3606b.tar.gz
git-64014894cfd29114a6b60cc501f06a68b5f3606b.tar.bz2
Merge branch 'jk/prompt-stash-could-be-packed'
The prompt script checked $GIT_DIR/ref/stash file to see if there is a stash, which was a no-no. * jk/prompt-stash-could-be-packed: git-prompt: do not look for refs/stash in $GIT_DIR
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-prompt.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 9d684b1..c5473dc 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