From ccab28a947d34a8d3d7e32569e82400bc0fe3c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?SZEDER=20G=C3=A1bor?= Date: Sat, 12 Dec 2015 01:18:18 +0100 Subject: [PATCH] completion: fix completing unstuck email alias arguments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Completing unstuck form of email aliases doesn't quite work: $ git send-email --to alice bob cecil $ git send-email --to a alice bob cecil While listing email aliases works as expected, the second case should just complete to 'alice', but it keeps offering all email aliases instead. The cause for this behavior is that in this case we mistakenly tell __gitcomp() explicitly that the current word to be completed is empty, while in reality it is not. As a result __gitcomp() doesn't filter out non-matching aliases, so all aliases end up being offered over and over again. Fix this by not passing the current word to be completed to __gitcomp() and letting it go the default route and grab it from the '$cur' variable. Don't pass empty prefix either, because it's assumed to be empty when unspecified, so it's not necessary. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 111b05302b..d9b995799c 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1716,7 +1716,7 @@ _git_send_email () --to|--cc|--bcc|--from) __gitcomp " $(git --git-dir="$(__gitdir)" send-email --dump-aliases 2>/dev/null) - " "" "" + " return ;; esac