mirror of
https://github.com/git/git
synced 2024-10-03 23:29:36 +00:00
Merge branch 'fc/git-complete-helper-fix'
Resurrects old behaviour of _git/_gitk for external users.
This commit is contained in:
commit
b19ea23473
|
@ -2597,7 +2597,7 @@ _git_whatchanged ()
|
||||||
_git_log
|
_git_log
|
||||||
}
|
}
|
||||||
|
|
||||||
_git ()
|
_main_git ()
|
||||||
{
|
{
|
||||||
local i c=1 command __git_dir
|
local i c=1 command __git_dir
|
||||||
|
|
||||||
|
@ -2648,7 +2648,7 @@ _git ()
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
_gitk ()
|
_main_gitk ()
|
||||||
{
|
{
|
||||||
__git_has_doubledash && return
|
__git_has_doubledash && return
|
||||||
|
|
||||||
|
@ -2700,13 +2700,25 @@ __git_complete ()
|
||||||
|| complete -o default -o nospace -F $wrapper $1
|
|| complete -o default -o nospace -F $wrapper $1
|
||||||
}
|
}
|
||||||
|
|
||||||
__git_complete git _git
|
# wrapper for backwards compatibility
|
||||||
__git_complete gitk _gitk
|
_git ()
|
||||||
|
{
|
||||||
|
__git_wrap_main_git
|
||||||
|
}
|
||||||
|
|
||||||
|
# wrapper for backwards compatibility
|
||||||
|
_gitk ()
|
||||||
|
{
|
||||||
|
__git_wrap_main_gitk
|
||||||
|
}
|
||||||
|
|
||||||
|
__git_complete git _main_git
|
||||||
|
__git_complete gitk _main_gitk
|
||||||
|
|
||||||
# The following are necessary only for Cygwin, and only are needed
|
# The following are necessary only for Cygwin, and only are needed
|
||||||
# when the user has tab-completed the executable name and consequently
|
# when the user has tab-completed the executable name and consequently
|
||||||
# included the '.exe' suffix.
|
# included the '.exe' suffix.
|
||||||
#
|
#
|
||||||
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
|
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
|
||||||
__git_complete git.exe _git
|
__git_complete git.exe _main_git
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -63,7 +63,7 @@ run_completion ()
|
||||||
local _cword
|
local _cword
|
||||||
_words=( $1 )
|
_words=( $1 )
|
||||||
(( _cword = ${#_words[@]} - 1 ))
|
(( _cword = ${#_words[@]} - 1 ))
|
||||||
__git_wrap_git && print_comp
|
__git_wrap_main_git && print_comp
|
||||||
}
|
}
|
||||||
|
|
||||||
test_completion ()
|
test_completion ()
|
||||||
|
|
Loading…
Reference in a new issue