summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-23 11:16:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-23 11:16:58 -0700
commit741917f40ce180d0f252a46e7a204cf19eb08289 (patch)
tree687a20ef50a723df81e8b2c79aa33bb0042cb5c3
parentMerge branch 'jk/receive-pack-deadlocks-with-early-failure' (diff)
parentprompt: fix untracked files for zsh (diff)
downloadtgif-741917f40ce180d0f252a46e7a204cf19eb08289.tar.xz
Merge branch 'fc/untracked-zsh-prompt'
* fc/untracked-zsh-prompt: prompt: fix untracked files for zsh
-rw-r--r--contrib/completion/git-prompt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 756a951459..054c52e90a 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -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