git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>, git@vger.kernel.org
Subject: Re: [PATCH] completion: zsh: improve bash script loading
Date: Wed, 29 May 2013 10:49:35 -0700	[thread overview]
Message-ID: <7vr4gpu15c.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAMP44s1UwYxS_sZSKTyEj5rhmrJ4gFkPc9z+eCL6WAaHXkY8eQ@mail.gmail.com> (Felipe Contreras's message of "Wed, 29 May 2013 01:30:48 -0500")

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.

Has this changed since 0a04e187e669 (completion: zsh: improve bash
script loading, 2013-05-24) which I have on 'pu'?

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

  reply	other threads:[~2013-05-29 17:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-29  3:24 [PATCH] completion: zsh: improve bash script loading Felipe Contreras
2013-05-29  6:17 ` Johannes Sixt
2013-05-29  6:30   ` Felipe Contreras
2013-05-29 17:49     ` Junio C Hamano [this message]
2013-05-29 19:30       ` Felipe Contreras
2013-05-29 19:58         ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2013-05-25  3:31 Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vr4gpu15c.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).