[PATCH] completion: fix zsh check under bash with 'set -u'
- From
Mark Lodato <lodatom@gmail.com>
- Date
- Oct 28, 2010, 01:08 UTC
- Message-ID
- <1288228101-23000-1-git-send-email-lodatom@gmail.com>
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 <lodatom@gmail.com> --- contrib/completion/git-completion.bash | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 64341d5..168669b 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
-- 1.7.3.2