From: Mark Lodato Date: Thu, 28 Oct 2010 01:08:21 +0000 (-0400) Subject: completion: fix zsh check under bash with 'set -u' X-Git-Tag: v1.7.4-rc0~159 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ca209065f3cc3462eb0ae6090f6b13f38aa2114c;p=git.git completion: fix zsh check under bash with 'set -u' Commit 06f44c3 (completion: make compatible with zsh) broke bash compatibility with 'set -u': a warning was generated when checking $ZSH_VERSION. The solution is to supply a default value, using ${ZSH_VERSION-}. Thanks to SZEDER Gábor for the fix. Signed-off-by: Mark Lodato Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 64341d53c..168669bbf 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2345,7 +2345,7 @@ _git () { local i c=1 command __git_dir - if [[ -n $ZSH_VERSION ]]; then + if [[ -n ${ZSH_VERSION-} ]]; then emulate -L bash setopt KSH_TYPESET fi @@ -2394,7 +2394,7 @@ _git () _gitk () { - if [[ -n $ZSH_VERSION ]]; then + if [[ -n ${ZSH_VERSION-} ]]; then emulate -L bash setopt KSH_TYPESET fi @@ -2434,7 +2434,7 @@ complete -o bashdefault -o default -o nospace -F _git git.exe 2>/dev/null \ || complete -o default -o nospace -F _git git.exe fi -if [[ -n $ZSH_VERSION ]]; then +if [[ -n ${ZSH_VERSION-} ]]; then shopt () { local option if [ $# -ne 2 ]; then