From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>, Paul Tan <pyokagan@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: More builtin git-am issues..
Date: Fri, 4 Sep 2015 16:52:42 -0700 [thread overview]
Message-ID: <CA+55aFw2bnhSQYk4FaHfp4ED0Y611NWyQs05TMQtFj=2As1=nA@mail.gmail.com> (raw)
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:
>
> 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
next prev parent reply other threads:[~2015-09-04 23:52 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-04 23:47 More builtin git-am issues Linus Torvalds
2015-09-04 23:52 ` Linus Torvalds [this message]
2015-09-05 0:07 ` Jeff King
2015-09-05 0:36 ` Linus Torvalds
2015-09-05 0:54 ` Junio C Hamano
2015-09-05 1:06 ` Linus Torvalds
2015-09-05 1:23 ` Junio C Hamano
2015-09-05 1:35 ` Linus Torvalds
2015-09-05 16:01 ` Junio C Hamano
2015-09-05 7:30 ` Johannes Sixt
2015-09-05 8:03 ` Jeff King
2015-09-05 16:10 ` Junio C Hamano
2015-09-05 16:32 ` Junio C Hamano
2015-09-05 16:57 ` Junio C Hamano
2015-09-05 19:39 ` Junio C Hamano
2015-09-07 19:27 ` Christian Couder
2015-09-05 15:24 ` Junio C Hamano
2015-09-05 15:34 ` Junio C Hamano
2015-09-05 1:06 ` Junio C Hamano
2015-09-05 1:20 ` Linus Torvalds
2015-09-05 1:24 ` Junio C Hamano
2015-09-06 4:56 ` [PATCH] am: match --signoff to the original scripted version Junio C Hamano
2015-09-06 9:04 ` Paul Tan
2015-09-06 17:24 ` Junio C Hamano
2015-09-08 6:18 ` Jeff King
2015-09-06 14:21 ` Paul Tan
2015-09-06 17:39 ` Junio C Hamano
2015-09-06 16:16 ` Linus Torvalds
2015-09-08 6:25 ` Jeff King
2015-09-08 18:14 ` 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='CA+55aFw2bnhSQYk4FaHfp4ED0Y611NWyQs05TMQtFj=2As1=nA@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
/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).