Re: [PATCH] completion: zsh: improve bash script loading

From

Junio C Hamano <gitster@pobox.com>

Date

May 29, 2013, 17:49 UTC

Message-ID

<7vr4gpu15c.fsf@alter.siamese.dyndns.org>

In-Reply-To

<CAMP44s1UwYxS_sZSKTyEj5rhmrJ4gFkPc9z+eCL6WAaHXkY8eQ@mail.gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> On Wed, May 29, 2013 at 1:17 AM, Johannes Sixt <j.sixt@viscovery.net> wrote:
>> Am 5/29/2013 5:24, schrieb Felipe Contreras:
>>> +if [ -z "$script" ]; then
>>> +     local -a locations
>>> +     locations=(
>>> +             '/etc/bash_completion.d/git' # fedora, old debian
>>> +             '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
>>> +             '/usr/share/bash-completion/git' # gentoo
>>> +             $(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
>>> +             )
>>
>> Won't you need
>>
>>         local e
>>
>> here, or does it not matter?
>
> You are right, otherwise it would be in the user's shell.

If not, I can do this locally to save a roundtrip, if you want.

 contrib/completion/git-completion.zsh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index 9555cf8..fac5e71 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -28,6 +28,7 @@ zstyle -T ':completion:*:*:git:*' tag-order && \
 zstyle -s ":completion:*:*:git:*" script script
 if [ -z "$script" ]; then
 	local -a locations
+	local e
 	locations=(
 		'/etc/bash_completion.d/git' # fedora, old debian
 		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian