diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-25 12:07:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-25 12:07:09 -0700 |
| commit | b19ea23473c45dd6d39b55b3d2134cc812820c41 (patch) | |
| tree | 9abec9cf6e4736b83056ad59c29d063c6c216444 /contrib/completion | |
| parent | Merge branch 'ap/checkout-no-progress-for-non-tty' (diff) | |
| parent | completion: add support for backwards compatibility (diff) | |
| download | tgif-b19ea23473c45dd6d39b55b3d2134cc812820c41.tar.xz | |
Merge branch 'fc/git-complete-helper-fix'
Resurrects old behaviour of _git/_gitk for external users.
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index cd92322161..1689f99539 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2597,7 +2597,7 @@ _git_whatchanged () _git_log } -_git () +_main_git () { local i c=1 command __git_dir @@ -2648,7 +2648,7 @@ _git () fi } -_gitk () +_main_gitk () { __git_has_doubledash && return @@ -2700,13 +2700,25 @@ __git_complete () || complete -o default -o nospace -F $wrapper $1 } -__git_complete git _git -__git_complete gitk _gitk +# wrapper for backwards compatibility +_git () +{ + __git_wrap_main_git +} + +# wrapper for backwards compatibility +_gitk () +{ + __git_wrap_main_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 |