Re: [RFC PATCHv3 1/4] am: avoid re-directing stdin twice
- From
Stephen Boyd <bebarino@gmail.com>
- Date
- Sep 5, 2014, 23:18 UTC
- Message-ID
- <CALaEz9Xbk_sAAJ0wNCgC9Rzr=E9Ke0H3YEwGr1_4VNgv0AwYhw@mail.gmail.com>
- In-Reply-To
- <xmqqfvg5puws.fsf@gitster.dls.corp.google.com>
(replying from webmail interface)
On Fri, Sep 5, 2014 at 3:25 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 9 quoted lines
> Junio C Hamano <gitster@pobox.com> writes: > >> Redoing what e3f67d30 (am: fix patch format detection for >> Thunderbird "Save As" emails, 2010-01-25) tried to do without >> wasting a fork and a pipe may be a workable improvement. >> >> I see Stephen who wrote the original "Thunderbird save-as" is >> already on the Cc list. How about doing it this way instead? >
It was so long ago I can't even remember writing that patch. But I googled the thread from 4.5 years ago and I see that you suggested we use tr because \r is not portable[1].
Show 19 quoted lines
> Not that way, but more like this.
>
> git-am.sh | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index ee61a77..32e3039 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -250,8 +250,7 @@ check_patch_format () {
> # discarding the indented remainder of folded lines,
> # and see if it looks like that they all begin with the
> # header field names...
> - tr -d '\015' <"$1" |
> - sed -n -e '/^$/q' -e '/^[ ]/d' -e p |
> + sed -n -e 's/\r$//' -e '/^$/q' -e '/^[ ]/d' -e p |
> sane_egrep -v '^[!-9;-~]+:' >/dev/null ||
> patch_format=mbox
> fi[1] http://git.661346.n2.nabble.com/PATCH-am-fix-patch-format-detection-for-Thunderbird-quot-Save-As-quot-emails-td4184273.html