Re: [RFC PATCH 0/1] am: bug report and new patch format support

From: Chris Packham <judge.packham@gmail.com>
Date: Sep 3, 2014, 10:18 UTC
Message-ID: <CAFOYHZCJhGtJcBUDdQXkF6SMCmQ=XDk2D+tQ3D6e4+i9VaqGew@mail.gmail.com>
In-Reply-To: <1409736919-22341-1-git-send-email-judge.packham@gmail.com>

On Wed, Sep 3, 2014 at 9:35 PM, Chris Packham <judge.packham@gmail.com> wrote:

Show 9 quoted lines

> Hi List,
>
> When I first tried to apply a patch someone gave me I got the following
> errors.
>
>   $ git am patch.patch
>   tr: write error: Broken pipe
>   tr: write error
>   Patch format detection failed.

I can't do this with every patch. It seems to be size related, if I feed it a big enough patch it triggers the error. Somewhere around 3000 lines triggers it for me. I think the cause is the following construct in check_patch_format

  {
    ...
    tr -d '\015' <"$1" |
    ...
  } < "$1" || clean_abort

Show 14 quoted lines

>
> The patch itself was generated from gitk and while I'd seen the format
> detection problem before but the tr errors were new to me. I haven't
> looked at the tr problem yet but the gitk thing had been bugging me for
> a while so here's a patch that understands the format generated by gitk.
>
>  Documentation/git-am.txt |    3 ++-
>  git-am.sh                |   35 +++++++++++++++++++++++++++++++++++
>  2 files changed, 37 insertions(+), 1 deletion(-)
>
> Chris Packham (1):
>       am: add gitk patch format
>
>