Re: [PATCH for maint branch] git-completion: fix zsh support

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 5, 2011, 19:29 UTC
Message-ID: <BANLkTikFnSuyfq6NT3wrWdE3AdkVXLmskw@mail.gmail.com>
In-Reply-To: <7vtyd9830w.fsf@alter.siamese.dyndns.org>

On Thu, May 5, 2011 at 8:34 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 26 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> It turns out 'words' is a special variable used by zsh completion.
>>
>> There's probably a bug in zsh's bashcompinit:
>> http://article.gmane.org/gmane.comp.shells.zsh.devel/22546
>>
>> But in the meantime we can workaround it this way.
>>
>> Currently zsh is completely broken after commit da48616 (bash: get
>> --pretty=m<tab> completion to work with bash v4), which introduced
>> _get_comp_words_by_ref() that comes from debian's bash_completion
>> scripts, and relies on the 'words' variable to behave like any normal
>> variable.
>>
>> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
>> ---
>>  contrib/completion/git-completion.bash |    3 +++
>>  1 files changed, 3 insertions(+), 0 deletions(-)
>>
>> This patch is meant for the maintenance branch, so Szeder's patches are not
>> needed.
>
> Do you mean sg/completion-upadates that is in 'next' need to be reverted
> and replaced with this one?  If that is the case I would love to have an
> Acked-by in this patch.

Are those patches going to be applied on the 'maint' branch? The first two are general cleanups, the third one is actually fixing stuff, but it depends on the previous ones. My approach doesn't require any other patches so it can be applied directly into maint. It can also be applied on top of the two cleanup patches from Szeder.

-- 
Felipe Contreras