[PATCH v2] Automatically autoload bashcompinit for ZSH, when needed
- From
Marius Storm-Olsen <marius@storm-olsen.com>
- Date
- Apr 27, 2011, 03:23 UTC
- Message-ID
- <1303874615-24718-1-git-send-email-mstormo@gmail.com>
- In-Reply-To
- <BANLkTi=qzBGmp80088hVrc+yicH2ofDGEg@mail.gmail.com>
If bashcompinit has not already been autoloaded, do so automatically, as it is required to properly parse the git-completion file with ZSH.
Signed-off-by: Marius Storm-Olsen <mstormo@gmail.com> --- Changes since v2: ----------------- 'Added' -> 'Add' Simplified test for bashcompinit, as per advice from Felipe Contreras
contrib/completion/git-completion.bash | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 840ae38..9150ea6 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1,6 +1,6 @@ #!bash # -# bash completion support for core Git. +# bash/zsh completion support for core Git. # # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org> # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/). @@ -18,16 +18,12 @@ # To use these routines: # # 1) Copy this file to somewhere (e.g. ~/.git-completion.sh). -# 2) Added the following line to your .bashrc: -# source ~/.git-completion.sh -# -# Or, add the following lines to your .zshrc: -# autoload bashcompinit -# bashcompinit +# 2) Add the following line to your .bashrc/.zshrc: # source ~/.git-completion.sh # # 3) Consider changing your PS1 to also show the current branch: -# PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ ' +# Bash: PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ ' +# ZSH: PS1='[%n@%m %c$(__git_ps1 " (%s)")]\$ ' # # The argument to __git_ps1 will be displayed only if you # are currently in a git repository. The %s token will be @@ -77,6 +73,10 @@ # git@vger.kernel.org # +if [[ -n ${ZSH_VERSION-} ]]; then + autoload -U +X bashcompinit && bashcompinit +fi + case "$COMP_WORDBREAKS" in *:*) : great ;; *) COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-- 1.7.5.rc2.4.g4d8b3