mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

completion: fix zsh check under bash with 'set -u'

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Mark Lodato
2010-10-27 21:08:21 -04:00
committed by Junio C Hamano
parent 7ebee44167
commit ca209065f3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/completion/git-completion.bash
View File

@ -2345,7 +2345,7 @@ _git ()
{ {
local i c=1 command __git_dir local i c=1 command __git_dir
if [[ -n $ZSH_VERSION ]]; then if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash emulate -L bash
setopt KSH_TYPESET setopt KSH_TYPESET
fi fi
@ -2394,7 +2394,7 @@ _git ()
_gitk () _gitk ()
{ {
if [[ -n $ZSH_VERSION ]]; then if [[ -n ${ZSH_VERSION-} ]]; then
emulate -L bash emulate -L bash
setopt KSH_TYPESET setopt KSH_TYPESET
fi 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 || complete -o default -o nospace -F _git git.exe
fi fi
if [[ -n $ZSH_VERSION ]]; then if [[ -n ${ZSH_VERSION-} ]]; then
shopt () { shopt () {
local option local option
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then