All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alex Merry <kde@randomguy3.me.uk>
To: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] Fix git-completion.bash for use in zsh
Date: Tue, 20 Mar 2012 11:53:06 +0000	[thread overview]
Message-ID: <4F686FA2.8070803@randomguy3.me.uk> (raw)
In-Reply-To: <4E5F8CF3.3060304@randomguy3.me.uk>

This is just a reminder message, since I haven't heard anything back on 
this, and it hasn't made its way into the repo.

I realise Felipe Contreras has been pushing a different approach to 
making it work properly in zsh, but this should be a fairly innocuous 
fix in the meantime.

Alex

On 01/09/11 14:47, Alex Merry wrote:
> Certain versions (or option combinations) of zsh appear to treat
> things like
> local some_var=()
> as a function declaration.  This makes errors appear when using it in
> combination with the GIT_PS1_SHOWUPSTREAM option.
>
> Signed-off-by: Alex Merry<dev@randomguy3.me.uk>
> ---
>   contrib/completion/git-completion.bash |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 5a83090..89de45d 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -106,8 +106,9 @@ __gitdir ()
>   __git_ps1_show_upstream ()
>   {
>          local key value
> -       local svn_remote=() svn_url_pattern count n
> +       local svn_remote svn_url_pattern count n
>          local upstream=git legacy="" verbose=""
> +       svn_remote=()
>
>          # get some config options from git-config
>          while read key value; do

  reply	other threads:[~2012-03-20 12:15 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-01 13:47 [PATCH] Fix git-completion.bash for use in zsh Alex Merry
2012-03-20 11:53 ` Alex Merry [this message]
2012-03-20 16:23   ` Junio C Hamano
2012-03-20 18:20     ` Junio C Hamano

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=4F686FA2.8070803@randomguy3.me.uk \
    --to=kde@randomguy3.me.uk \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.