diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:11 -0700 |
| commit | 8ec959fbcec5f12925eb0a4a60e789a818fdccb9 (patch) | |
| tree | 91d4bb1390bf4738123db1567e83565ef9e302cd /contrib | |
| parent | 92ea1ac8267a14f4eae55f175ac7ff0aeaaddc89 (diff) | |
| parent | 0fa7f01635aa0356823d5cbb5109f61b0f307e4b (diff) | |
| download | git-8ec959fbcec5f12925eb0a4a60e789a818fdccb9.tar.gz | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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 |