mirror of
https://github.com/git/git.git
synced 2025-03-19 00:08:45 +00:00
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 <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7ebee44167
commit
ca209065f3
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user