diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-13 21:50:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-13 21:50:45 +0200 |
| commit | 4d605b0f38775066be0eaed33c52e0b716035498 (patch) | |
| tree | 2dfd13dc49b7105ebc566e67058583ba08c8bb60 /contrib | |
| parent | Merge branch 'sb/submodule-merge-in-merge-recursive' (diff) | |
| parent | completion: correct zsh detection when run from git-completion.zsh (diff) | |
| download | git-4d605b0f38775066be0eaed33c52e0b716035498.tar.xz git-4d605b0f38775066be0eaed33c52e0b716035498.zip | |
Merge branch 'sg/completion-zsh-workaround'
Work around zsh segfaulting when loading git-completion.zsh
* sg/completion-zsh-workaround:
completion: correct zsh detection when run from git-completion.zsh
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 5 | ||||
| -rw-r--r-- | contrib/completion/git-completion.zsh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 12814e9bbf..dd3e925843 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -3223,7 +3223,10 @@ __gitk_main () __git_complete_revlist } -if [[ -n ${ZSH_VERSION-} ]]; then +if [[ -n ${ZSH_VERSION-} ]] && + # Don't define these functions when sourced from 'git-completion.zsh', + # it has its own implementations. + [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2 autoload -U +X compinit && compinit diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 53cb0f934f..049d6b80f6 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -39,7 +39,7 @@ if [ -z "$script" ]; then test -f $e && script="$e" && break done fi -ZSH_VERSION='' . "$script" +GIT_SOURCING_ZSH_COMPLETION=y . "$script" __gitcomp () { |