summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2012-05-19 04:41:34 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-20 14:47:54 -0700
commit7f02f3d7ecdda983f229b16f80e7c494fb2d3510 (patch)
tree485c4466c4e77a7e8dd5864fee58a2a55d43e4da /contrib/completion
parentcompletion: add new __git_complete helper (diff)
downloadtgif-7f02f3d7ecdda983f229b16f80e7c494fb2d3510.tar.xz
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>
Diffstat (limited to 'contrib/completion')
-rwxr-xr-xcontrib/completion/git-completion.bash10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d60bb8ac8f..5d608a125b 100755
--- 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