Merge branch 'sg/completion-zsh-workaround'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000 (12:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jun 2018 19:50:45 +0000 (12:50 -0700)
Work around zsh segfaulting when loading git-completion.zsh

* sg/completion-zsh-workaround:
  completion: correct zsh detection when run from git-completion.zsh

1  2 
contrib/completion/git-completion.bash
contrib/completion/git-completion.zsh

Simple merge