Re: [PATCH] bash-completion: don't add quoted space for ZSH (fix regression)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 25, 2012, 04:06 UTC
- Message-ID
- <7vsjj41l4h.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CAMP44s2x2kJEJsQLZCJiegZY863X=kVO5xof9QBUin35i-BzhA@mail.gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 6 quoted lines
>> At worse, my patch is not intrusive and can easily be reworked later. > > I believe I have found a more generic and simpler fix that works for > both the regression in v1.7.9, and users of zsh >= 4.3.12. > > Patch sent.
Matthieu, care to take a look?
It looks fairly straightforward and would have absolutely no impact on bash users.
Thanks, Felipe.
-- >8 -- From: Felipe Contreras <felipe.contreras@gmail.com> Subject: [PATCH] git-completion: workaround zsh COMPREPLY bug
zsh adds a backslash (foo\ ) for each item in the COMPREPLY array if IFS doesn't contain spaces. This issue has been reported[1], but there is no solution yet.
This wasn't a problem due to another bug[2], which was fixed in zsh version 4.3.12. After this change, 'git checkout ma<tab>' would resolve to 'git checkout master\ '.
Aditionally, the introduction of __gitcomp_nl in commit a31e626 (completion: optimize refs completion) in git also made the problem apparent, as Matthieu Moy reported.
The simplest and most generic solution is to hide all the changes we do to IFS, so that "foo \nbar " is recognized by zsh as "foo bar". This works on versions of git before and after the introduction of __gitcomp_nl (a31e626), and versions of zsh before and after 4.3.12.
Once zsh is fixed, we should conditionally disable this workaround to have the same benefits as bash users.
[1] http://www.zsh.org/mla/workers/2012/msg00053.html [2] http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=commitdiff;h=2e25dfb8fd38dbef0a306282ffab1d343ce3ad8d
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> --- contrib/completion/git-completion.bash | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b0062ba..c83c734 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2631,6 +2631,10 @@ _git () # workaround zsh's bug that leaves 'words' as a special # variable in versions < 4.3.12 typeset -h words + + # another workaround for zsh because it would quote spaces in + # the COMPREPLY array if IFS doesn't contain spaces + typeset -h IFS fi local cur words cword prev @@ -2687,6 +2691,10 @@ _gitk () # workaround zsh's bug that leaves 'words' as a special # variable in versions < 4.3.12 typeset -h words + + # another workaround for zsh because it would quote spaces in + # the COMPREPLY array if IFS doesn't contain spaces + typeset -h IFS fi local cur words cword prev