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
This commit is contained in:
commit
8ec959fbce
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user