completion: rename internal helpers _git and _gitk

felipec · gitster · commit 7f02f3d7ecdd · 2012-05-20T14:47:54.000-07:00
Would be useful to provide backwards compatibility for _git. Also, zsh
completion uses _git, and it cannot be changed.

Signed-off-by: Felipe Contreras &lt;felipe.contreras@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -2599,7 +2599,7 @@ _git_whatchanged ()
 	_git_log
 }
 
-_git ()
+_main_git ()
 {
 	local i c=1 command __git_dir
 
@@ -2650,7 +2650,7 @@ _git ()
 	fi
 }
 
-_gitk ()
+_main_gitk ()
 {
 	__git_has_doubledash && return
 
@@ -2702,13 +2702,13 @@ __git_complete ()
 		|| 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
-__git_complete git.exe _git
+__git_complete git.exe _main_git
 fi
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
@@ -63,7 +63,7 @@ run_completion ()
 	local _cword
 	_words=( $1 )
 	(( _cword = ${#_words[@]} - 1 ))
-	__git_wrap_git && print_comp
+	__git_wrap_main_git && print_comp
 }
 
 test_completion ()

Original file line number	Diff line number	Diff line change
`@@ -2599,7 +2599,7 @@ _git_whatchanged ()`
`2599`	`2599`	`_git_log`
`2600`	`2600`	`}`
`2601`	`2601`
`2602`		`-_git ()`
	`2602`	`+_main_git ()`
`2603`	`2603`	`{`
`2604`	`2604`	`local i c=1 command __git_dir`
`2605`	`2605`
`@@ -2650,7 +2650,7 @@ _git ()`
`2650`	`2650`	`fi`
`2651`	`2651`	`}`
`2652`	`2652`
`2653`		`-_gitk ()`
	`2653`	`+_main_gitk ()`
`2654`	`2654`	`{`
`2655`	`2655`	`__git_has_doubledash && return`
`2656`	`2656`
`@@ -2702,13 +2702,13 @@ __git_complete ()`
`2702`	`2702`	`\|\| complete -o default -o nospace -F $wrapper $1`
`2703`	`2703`	`}`
`2704`	`2704`
`2705`		`-__git_complete git _git`
`2706`		`-__git_complete gitk _gitk`
	`2705`	`+__git_complete git _main_git`
	`2706`	`+__git_complete gitk _main_gitk`
`2707`	`2707`
`2708`	`2708`	`# The following are necessary only for Cygwin, and only are needed`
`2709`	`2709`	`# when the user has tab-completed the executable name and consequently`
`2710`	`2710`	`# included the '.exe' suffix.`
`2711`	`2711`	`#`
`2712`	`2712`	`if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then`
`2713`		`-__git_complete git.exe _git`
	`2713`	`+__git_complete git.exe _main_git`
`2714`	`2714`	`fi`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ run_completion ()`
`63`	`63`	`local _cword`
`64`	`64`	`_words=( $1 )`
`65`	`65`	`(( _cword = ${#_words[@]} - 1 ))`
`66`		`- __git_wrap_git && print_comp`
	`66`	`+ __git_wrap_main_git && print_comp`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`test_completion ()`