diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-13 11:47:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-13 11:47:11 -0700 |
| commit | 2cf4cfa7e9e63e3d0df24f87076ed9e221e20b9a (patch) | |
| tree | 9c4d6d05dded8637ca221d1c308057d51f3cb30d /contrib/completion | |
| parent | completion: remove credential helpers from porcelain commands (diff) | |
| parent | completion: put main git and gitk completion functions back into git namespace (diff) | |
| download | tgif-2cf4cfa7e9e63e3d0df24f87076ed9e221e20b9a.tar.xz | |
Merge branch 'fc/git-complete-helper-fix'
* fc/git-complete-helper-fix:
completion: put main git and gitk completion functions back into git namespace
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b687d7e8d5..2e1b5e14b9 100755 --- a/contrib/completion/git-completion.bash +++ b/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 |