completion: put main git and gitk completion functions back into git …

…namespace

Commit 7f02f3d (completion: rename internal helpers _git and _gitk,
2012-05-19) renamed said functions to _main_git() and _main_gitk(),
respectively.  By convention the name of our git-completion-specific
functions start with '_git' or '__git' prefix, so rename those
functions once again to put them back into our "namespace".  Use the
two underscore prefix, because _git_main() could be mistaken for the
completion function of the (not yet existing) 'git main' command.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

contrib/completion/git-completion.bash

@@ -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

t/t9902-completion.sh

@@ -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 ()