Andrew's git / gitweb.git / diff
?
Merge branch 'fc/untracked-zsh-prompt' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:12:30 +0000 (11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:12:30 +0000 (11:12 -0700)
* fc/untracked-zsh-prompt:
prompt: fix untracked files for zsh

contrib/completion/git-prompt.sh patch | blob | history
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 756a9514591c7664c82c93d3a6d50d91f46857d8..054c52e90aeabb9a9ab5d4f9ee38b0799126b338 100644 (file)
--- 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