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

* fc/untracked-zsh-prompt:
prompt: fix untracked files for zsh

diff --combined contrib/completion/git-prompt.sh
index 756a9514591c7664c82c93d3a6d50d91f46857d8,d2af85403d5053ad4c6dd5d5a4761e0de9eb8838..054c52e90aeabb9a9ab5d4f9ee38b0799126b338
--- 1/contrib/completion/git-prompt.sh
--- 2/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@@ -282,8 -282,6 +282,8 @@@ __git_ps1 (
                                r="|MERGING"
                        elif [ -f "$g/CHERRY_PICK_HEAD" ]; then
                                r="|CHERRY-PICKING"
 +                      elif [ -f "$g/REVERT_HEAD" ]; then
 +                              r="|REVERTING"
                        elif [ -f "$g/BISECT_LOG" ]; then
                                r="|BISECTING"
                        fi
@@@ -340,7 -338,7 +340,7 @@@
                           [ "$(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