Re: More builtin git-am issues..

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sep 4, 2015, 23:52 UTC
Message-ID: <CA+55aFw2bnhSQYk4FaHfp4ED0Y611NWyQs05TMQtFj=2As1=nA@mail.gmail.com>
In-Reply-To: <CA+55aFzN4SnenchxPScn61_apzitGAPtoYEd49iLZPxgK0KQGw@mail.gmail.com>

On Fri, Sep 4, 2015 at 4:47 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:

Show 9 quoted lines

>
> I *think* it's this part:
>
>                 if (!(found_rfc2822 ||
>                       is_cherry_picked_from_line(buf + i, k - i - 1)))
>                         return 0;
>
> which basically returns 0 for _any_ line in the footer that doesn't
> match the found_rfc2822 format.

Confirmed. I hacked up a version that just doesn't do that check at all, and it works fine (but obviously only on well-formatted emails that really do have a sign-off).

So I think that logic should basically be extended to saying

 - if any line in the last chunk has a "Signed-off-by:", set a flag.

 - at the end of the loop, if that flag wasn't set, return 0.

Instead of that thing that basically returns zero immediately when it sees a line it doesn't like.

I'm in the middle of my merge window, so I'm not going to get around to writing a patch until that's over. Hopefully somebody will step up in the meantime. Hint, hint.

                   Linus