From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Robert Abel <rabel@robertabel.eu>,
Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] git-prompt: fix reading files with windows line endings
Date: Fri, 1 Dec 2017 00:45:45 +0100 [thread overview]
Message-ID: <CAM0VKjnpUNhMJk6wk1prtvr2SjOuhMLKWQ7zf8S6w-0yfD5WcQ@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.21.1.1711300250320.6482@virtualbox>
On Thu, Nov 30, 2017 at 2:51 AM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> On Thu, 30 Nov 2017, SZEDER Gábor wrote:
>
>> > > diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
>> > > index c6cbef38c2..71a64e7959 100644
>> > > --- a/contrib/completion/git-prompt.sh
>> > > +++ b/contrib/completion/git-prompt.sh
>> > > @@ -282,7 +282,7 @@ __git_eread ()
>> > > {
>> > > local f="$1"
>> > > shift
>> > > - test -r "$f" && read "$@" <"$f"
>> > > + test -r "$f" && read "$@" <"$f" && export $@="${!@%$'\r'}"
>>
>> I don't think that export is necessary here.
>>
>> > As far as I understand, $'\r' is a Bash-only construct, and this file
>> > (git-prompt.sh) is targeting other Unix shells, too.
>>
>> The only other shell the prompt (and completion) script is targeting
>> is ZSH, and ZSH understands this construct. We already use this
>> construct to set IFS in several places in both scripts for a long
>> time, so it should be fine here, too.
>
> That's good to know! I should have `git grep`ped...
>
> Sorry for the noise,
No, no, your concern is justified, you just happened to pick the wrong
construct :)
It's the ${!var} indirect expansion construct that ZSH doesn't know, it
uses a different syntax for that.
Gábor
prev parent reply other threads:[~2017-11-30 23:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-28 20:18 git-prompt: fix reading files with windows line endings Robert Abel
2017-11-28 20:18 ` [PATCH] " Robert Abel
2017-11-29 14:27 ` Johannes Schindelin
2017-11-29 22:09 ` Robert Abel
2017-11-30 0:21 ` Johannes Schindelin
2017-11-30 6:22 ` Robert Abel
2017-11-30 15:21 ` Johannes Schindelin
2017-11-30 18:01 ` Robert Abel
2017-12-01 10:45 ` Johannes Schindelin
2017-12-01 23:31 ` [PATCH v2 1/2] git-prompt: make __git_eread intended use explicit Robert Abel
2017-12-01 23:31 ` [PATCH v2 2/2] git-prompt: fix reading files with windows line endings Robert Abel
2017-12-04 14:18 ` Johannes Schindelin
2017-12-04 17:58 ` [PATCH v2 1/2] git-prompt: make __git_eread intended use explicit Junio C Hamano
2017-12-04 22:57 ` Robert Abel
2017-12-05 0:27 ` Junio C Hamano
2017-12-05 7:01 ` Robert Abel
2017-12-05 13:06 ` Junio C Hamano
2017-12-05 23:37 ` Robert Abel
2017-12-05 23:39 ` [PATCH v4 " Robert Abel
2017-12-05 23:39 ` [PATCH v4 2/2] git-prompt: fix reading files with windows line endings Robert Abel
2017-12-04 23:49 ` [PATCH v3 1/2] git-prompt: make __git_eread intended use explicit Robert Abel
2017-12-04 23:49 ` [PATCH v3 2/2] git-prompt: fix reading files with windows line endings Robert Abel
2017-11-30 1:08 ` [PATCH] " SZEDER Gábor
2017-11-30 1:51 ` Johannes Schindelin
2017-11-30 23:45 ` SZEDER Gábor [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAM0VKjnpUNhMJk6wk1prtvr2SjOuhMLKWQ7zf8S6w-0yfD5WcQ@mail.gmail.com \
--to=szeder.dev@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=rabel@robertabel.eu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).