diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-26 11:12:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-26 11:12:30 -0700 |
commit | 1a475c4a2f4fead39b4e80dcdfbcf0627dfb5327 (patch) | |
tree | 160543c594d731528801ca0f516abd403c6d8b96 | |
parent | bd8e3385d5f61b2518286f81678a24a1cb88416d (diff) | |
parent | 24b6132e571bf2e27536d42022f8c0733034d880 (diff) | |
download | git-1a475c4a2f4fead39b4e80dcdfbcf0627dfb5327.tar.gz git-1a475c4a2f4fead39b4e80dcdfbcf0627dfb5327.tar.xz |
Merge branch 'fc/untracked-zsh-prompt' into maint
* fc/untracked-zsh-prompt:
prompt: fix untracked files for zsh
-rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 756a95145..054c52e90 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 |