completion: rename internal helpers _git and _gitk

Would be useful to provide backwards compatibility for _git. Also, zsh
completion uses _git, and it cannot be changed.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d60bb8ac8f62d44cafea3282867be158c6b68cbb..5d608a125bbbd1330692ba4c11ed1295e6950ad2 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2599,7 +2599,7 @@ _git_whatchanged ()
        _git_log
 }
 
        _git_log
 }
 

-_git ()
+_main_git ()

 {
        local i c=1 command __git_dir
 
 {
        local i c=1 command __git_dir
 


@@ -2650,7 +2650,7 @@ _git ()
        fi
 }
 
        fi
 }
 

-_gitk ()
+_main_gitk ()

 {
        __git_has_doubledash && return
 
 {
        __git_has_doubledash && return
 


@@ -2702,13 +2702,13 @@ __git_complete ()
                || complete -o default -o nospace -F $wrapper $1
 }
 
                || complete -o default -o nospace -F $wrapper $1
 }
 

-__git_complete git _git
-__git_complete gitk _gitk
+__git_complete git _main_git
+__git_complete gitk _main_gitk

 
 # 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
 
 # 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 _git
+__git_complete git.exe _main_git

 fi
 fi

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 0f09fd6109386ae408a4441562ed69b6650880ae..9a80c60945839fa66fc3a0dc742a8f9ac977f9e1 100755 (executable)
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -63,7 +63,7 @@ run_completion ()
        local _cword
        _words=( $1 )
        (( _cword = ${#_words[@]} - 1 ))
        local _cword
        _words=( $1 )
        (( _cword = ${#_words[@]} - 1 ))

-       __git_wrap_git && print_comp
+       __git_wrap_main_git && print_comp

 }
 
 test_completion ()
 }
 
 test_completion ()