global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 18:33:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  completion: fix zsh check under bash with 'set -u'
This commit is contained in:
Junio C Hamano
2010-10-28 17:14:03 -07:00
parent 2d0e57103f ca209065f3
commit 78bbbf98d9
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
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