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

diff --cc contrib/completion/git-completion.bash
Simple merge

diff --cc contrib/completion/git-completion.zsh
Simple merge