Merge branch 'sg/completion-zsh-workaround'
commit4d605b0f38775066be0eaed33c52e0b716035498
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000 (13 12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000 (13 12:50 -0700)
tree2dfd13dc49b7105ebc566e67058583ba08c8bb60
parent8d0d53a8cf2cc0d68e396df155beba8344d7810f
parent61d48c66ea7ef8acc0dd1114e0f79f4250aead38
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
contrib/completion/git-completion.bash
contrib/completion/git-completion.zsh