Merge branch 'fc/untracked-zsh-prompt' into maint

* fc/untracked-zsh-prompt:
  prompt: fix untracked files for zsh
This commit is contained in:
Junio C Hamano 2013-04-26 11:12:30 -07:00
commit 1a475c4a2f

View File

@ -340,7 +340,7 @@ __git_ps1 ()
[ "$(git config --bool bash.showUntrackedFiles)" != "false" ] &&
[ -n "$(git ls-files --others --exclude-standard)" ]
then
u="%"
u="%${ZSH_VERSION+%}"
fi
if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then