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/completion/git-completion.zsh | |
| 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/completion/git-completion.zsh')
| -rw-r--r-- | contrib/completion/git-completion.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
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 () { |