development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fc/git-complete-helper-fix'

Browse source 
* fc/git-complete-helper-fix:
  completion: put main git and gitk completion functions back into git namespace
This commit is contained in:
Junio C Hamano 2012-06-13 11:47:11 -07:00
parent 1dad5c14f9 93b291e071
commit 2cf4cfa7e9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
contrib/completion/git-completion.bash
View file

@ -2599,7 +2599,7 @@ _git_whatchanged ()
_git_log
}
_main_git ()
__git_main ()
{
local i c=1 command __git_dir
@ -2650,7 +2650,7 @@ _main_git ()
fi
}
_main_gitk ()
__gitk_main ()
{
__git_has_doubledash && return
@ -2705,22 +2705,22 @@ __git_complete ()
# wrapper for backwards compatibility
_git ()
{
__git_wrap_main_git
__git_wrap__git_main
}
# wrapper for backwards compatibility
_gitk ()
{
__git_wrap_main_gitk
__git_wrap__gitk_main
}
__git_complete git _main_git
__git_complete gitk _main_gitk
__git_complete git __git_main
__git_complete gitk __gitk_main
# The following are necessary only for Cygwin, and only are needed
# when the user has tab-completed the executable name and consequently
# included the '.exe' suffix.
#
if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
__git_complete git.exe _main_git
__git_complete git.exe __git_main
fi

2
t/t9902-completion.sh
View file

@ -63,7 +63,7 @@ run_completion ()
local _cword
_words=( $1 )
(( _cword = ${#_words[@]} - 1 ))
__git_wrap_main_git && print_comp
__git_wrap__git_main && print_comp
}
test_completion ()