From: Felipe Contreras <felipe.contreras@gmail.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, szeder@ira.uka.de
Subject: Re: [PATCH] prompt: fix show upstream with svn and zsh
Date: Tue, 21 May 2013 22:13:22 -0500 [thread overview]
Message-ID: <CAMP44s3uEaG3Y+cVoKhCA-f+hi1VZcCpXO5bYCQLvANDdvYwRA@mail.gmail.com> (raw)
In-Reply-To: <1369169667-25166-1-git-send-email-t.gummerer@gmail.com>
On Tue, May 21, 2013 at 3:54 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:
> Currently the __git_ps1 git prompt gives the following error with a
> repository converted by git-svn, when used with zsh:
>
> __git_ps1_show_upstream:19: bad pattern: svn_remote[
>
> This was introduced by 6d158cba (bash completion: Support "divergence
> from upstream" messages in __git_ps1), when the script was for bash
> only. Make it compatible with zsh.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
This patch is fine by me. I would like to see an example of how to
trigger the issue with a standalone command in the commit message, but
it's not necessary. It would also make sense to address the comment
from Szeder that does raise questions about other places in the code
where 'array[ $foo ]' is used, maybe there's a caveat we are not
considering, or maybe your use-case did not execute that code.
And finally, I don't recall seen 'set -a' used elsewhere in the code.
If memory serves well, we have replaced 'local -a foo=value' with
'local -a foo\nfoo=value' before to fix zsh issues, I think that would
be safer.
But this patch is needed regardless, that, or the patch that broke
things should be reverted for v1.8.3.
Thomas, if you don't have time, let me know and I can take a look.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2013-05-22 3:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-21 20:54 [PATCH] prompt: fix show upstream with svn and zsh Thomas Gummerer
2013-05-21 22:41 ` SZEDER Gábor
2013-05-21 23:04 ` Felipe Contreras
2013-05-21 23:36 ` SZEDER Gábor
2013-05-22 0:03 ` Felipe Contreras
2013-05-22 0:20 ` SZEDER Gábor
2013-05-22 0:29 ` Felipe Contreras
2013-05-22 0:44 ` SZEDER Gábor
2013-05-22 7:32 ` Thomas Gummerer
2013-05-28 10:30 ` SZEDER Gábor
2013-05-22 3:13 ` Felipe Contreras [this message]
2013-05-22 7:36 ` Thomas Gummerer
2013-05-22 7:40 ` [PATCH v2] " Thomas Gummerer
2013-05-22 7:56 ` 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=CAMP44s3uEaG3Y+cVoKhCA-f+hi1VZcCpXO5bYCQLvANDdvYwRA@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder@ira.uka.de \
--cc=t.gummerer@gmail.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 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).