diff options
author | Felipe Contreras <felipe.contreras@gmail.com> | 2014-04-09 13:50:04 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-04-09 14:22:18 -0700 |
commit | 880111c11befaaf070e8ea1021bf11b4fb58c461 (patch) | |
tree | b823cf2a33d9f1115996cdccb346d08e2bc37e62 /contrib/completion/git-completion.zsh | |
parent | 68773ac915580e88016c34ce1269730382b501d4 (diff) | |
download | git-880111c11befaaf070e8ea1021bf11b4fb58c461.tar.gz |
completion: fix completing args of aliased "push", "fetch", etc.fc/complete-aliased-push
Some commands need the first word to determine the actual action that is
being executed, however, the command is wrong when we use an alias, for
example 'alias.p=push', if we try to complete 'git p origin ', the
result would be wrong because __git_complete_remote_or_refspec() doesn't
know where it came from.
So let's override words[1], so the alias 'p' is override by the actual
command, 'push'.
Reported-by: Aymeric Beaumet <aymeric.beaumet@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion/git-completion.zsh')
-rw-r--r-- | contrib/completion/git-completion.zsh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 6b77968572..9f6f0fa558 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -104,6 +104,7 @@ __git_zsh_bash_func () local expansion=$(__git_aliased_command "$command") if [ -n "$expansion" ]; then + words[1]=$expansion completion_func="_git_${expansion//-/_}" declare -f $completion_func >/dev/null && $completion_func fi |