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

* fc/untracked-zsh-prompt: prompt: fix untracked files for zsh
git-mirror · Apr 26, 2013 · 1a475c4 · 1a475c4
2 parents bd8e338 + 24b6132
commit 1a475c4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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