mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jk/prompt-stash-could-be-packed:
  git-prompt: do not look for refs/stash in $GIT_DIR
This commit is contained in:
Junio C Hamano
2014-09-19 14:05:11 -07:00
parent 92ea1ac826 0fa7f01635
commit 8ec959fbce
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/completion/git-prompt.sh
View File

@ -468,7 +468,8 @@ __git_ps1 ()
fi fi
fi fi
if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] && if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ] &&
[ -r "$g/refs/stash" ]; then git rev-parse --verify --quiet refs/stash >/dev/null
then
s="$" s="$"
fi fi