From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "David J. Malan via GitGitGadget" <gitgitgadget@gmail.com>,
Git Mailing List <git@vger.kernel.org>,
"David J. Malan" <malan@harvard.edu>
Subject: Re: [PATCH] git-prompt: changes == to = for zsh's sake
Date: Mon, 20 Jul 2020 17:40:46 -0700 [thread overview]
Message-ID: <CABPp-BGm4UuRsL0K5=rAxyXaQYTgWicmFKNcRRfJziQ7BmSP1g@mail.gmail.com> (raw)
In-Reply-To: <xmqqpn8p91sy.fsf@gitster.c.googlers.com>
On Mon, Jul 20, 2020 at 4:58 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> "David J. Malan via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > From: "David J. Malan" <malan@harvard.edu>
> > Subject: Re: [PATCH] git-prompt: changes == to = for zsh's sake
>
> s/changes/change/
>
> > When using git-prompt.sh with Zsh, __git_ps1 currently errs
> > when inside a repo with:
> >
> > __git_ps1:96: = not found
>
> OK.
>
> > This commit changes `==` to `=` for both Bash and Zsh.
>
> We prefer to see "why" instead of "what", as the latter can easily
> be read from the patch text.
>
> Avoid using non-portable "==" that is only understood by bash
> and not zsh to "="; that way the prompt script becomes usable
> with zsh again.
>
> or something like that.
>
> Elijah, I think this is a minor regression in this cycle, and the
> fix is obvious enough that it deserves to be in the upcoming
> release. Agreed?
Yeah, it's a pretty obvious and very localized fix for a regression
from this cycle. I'd say putting it in the upcoming release makes
sense.
> Thank you, David, for a fix.
+1.
> > Signed-off-by: David J. Malan <malan@harvard.edu>
> > ---
> > Changes == to = for zsh's sake in git-prompt.sh
> >
> > Upon installing git-prompt.sh
> > [https://github.com/gitgitgadget/git/blob/master/contrib/completion/git-prompt.sh]
> > on macOS Catalina, I noticed that
> > https://github.com/gitgitgadget/git/commit/afda36dbf3b4f5a489ab44c00d5210c1fa894a40
> > seems to have introduced an issue for Zsh whereby __git_ps1 errs with
> >
> > __git_ps1:96: = not found
> >
> > when inside a repo. Changing == to = would seem to address for both Bash
> > and Zsh.
> >
> > Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-679%2Fdmalan%2Fpatch-1-v1
> > Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-679/dmalan/patch-1-v1
> > Pull-Request: https://github.com/gitgitgadget/git/pull/679
> >
> > contrib/completion/git-prompt.sh | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
> > index e6cd5464e5..16260bab73 100644
> > --- a/contrib/completion/git-prompt.sh
> > +++ b/contrib/completion/git-prompt.sh
> > @@ -433,7 +433,7 @@ __git_ps1 ()
> > local sparse=""
> > if [ -z "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
> > [ -z "${GIT_PS1_OMITSPARSESTATE}" ] &&
> > - [ "$(git config --bool core.sparseCheckout)" == "true" ]; then
> > + [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
> > sparse="|SPARSE"
> > fi
> >
> > @@ -542,7 +542,7 @@ __git_ps1 ()
> > fi
> >
> > if [ -n "${GIT_PS1_COMPRESSSPARSESTATE}" ] &&
> > - [ "$(git config --bool core.sparseCheckout)" == "true" ]; then
> > + [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
> > h="?"
> > fi
> >
> >
> > base-commit: ae46588be0cd730430dded4491246dfb4eac5557
next prev parent reply other threads:[~2020-07-21 0:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 23:17 [PATCH] git-prompt: changes == to = for zsh's sake David J. Malan via GitGitGadget
2020-07-20 23:58 ` Junio C Hamano
2020-07-21 0:40 ` Elijah Newren [this message]
2020-07-21 0:15 ` [PATCH v2] git-prompt: change " David J. Malan via GitGitGadget
2020-07-21 0:23 ` [PATCH] git-prompt: changes " Aaron Schrab
2020-07-21 0:40 ` 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='CABPp-BGm4UuRsL0K5=rAxyXaQYTgWicmFKNcRRfJziQ7BmSP1g@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=malan@harvard.edu \
/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).