From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Apr 2013 18:16:58 +0000 (-0700)
Subject: Merge branch 'fc/untracked-zsh-prompt'
X-Git-Tag: v1.8.3-rc0~25
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/741917f40ce180d0f252a46e7a204cf19eb08289?ds=inline;hp=-c

Merge branch 'fc/untracked-zsh-prompt'

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

741917f40ce180d0f252a46e7a204cf19eb08289
diff --combined contrib/completion/git-prompt.sh
index 756a951459,d2af85403d..054c52e90a
--- a/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