From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Apr 2014 18:17:36 +0000 (-0700)
Subject: Merge branch 'fc/complete-aliased-push'
X-Git-Tag: v2.0.0-rc0~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/961c1b191acccb13bab5895f546034bb2f47eddb?hp=427ed406cda52f07b36dd8fe69c8c7ad6e6ae39a

Merge branch 'fc/complete-aliased-push'

* fc/complete-aliased-push:
completion: fix completing args of aliased "push", "fetch", etc.
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 87de809d23..2c59a76bc2 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2564,6 +2564,7 @@ __git_main ()
 
 	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
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