From: Jeff King <peff@peff.net> To: Eric Blake <eblake@redhat.com> Cc: Christian Schoenebeck <qemu_oss@crudebyte.com>, qemu-devel@nongnu.org, git@vger.kernel.org, berrange@redhat.com, stefanha@gmail.com, Greg Kurz <groug@kaod.org>, dgilbert@redhat.com, antonios.motakis@huawei.com Subject: Re: [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Date: Mon, 9 Sep 2019 10:25:12 -0400 [thread overview] Message-ID: <20190909142511.GA20726@sigill.intra.peff.net> (raw) In-Reply-To: <305577c2-709a-b632-4056-6582771176ac@redhat.com> On Mon, Sep 09, 2019 at 09:05:45AM -0500, Eric Blake wrote: > > But as you can already read from the manual, the overall behaviour of git > > regarding a separate "From:" line in the email body was intended solely for > > the use case sender != author. So in practice (at least in my git version) git > > always makes a raw string comparison between sender (name and email) string > > and author string and only adds the separate From: line to the body if they > > differ. > > > > Hence also "git format-patch --from=" only works here if you use a different > > author string (name and email) there, otherwise on a perfect string match it > > is simply ignored and you end up with only one "From:" in the email header. > > git folks: > > How hard would it be to improve 'git format-patch'/'git send-email' to > have an option to ALWAYS output a From: line in the body, even when the > sender is the author, for the case of a mailing list that munges the > mail headers due to DMARC/DKIM reasons? It wouldn't be very hard to ask format-patch to just handle this unconditionally. Something like: diff --git a/pretty.c b/pretty.c index e4ed14effe..9cf79d7874 100644 --- a/pretty.c +++ b/pretty.c @@ -451,7 +451,8 @@ void pp_user_info(struct pretty_print_context *pp, map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); if (cmit_fmt_is_mail(pp->fmt)) { - if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) { + if (pp->always_use_in_body_from || + (pp->from_ident && ident_cmp(pp->from_ident, &ident))) { struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, "From: "); but most of the work would be ferrying that option from the command line down to the pretty-print code. That would work in conjunction with "--from" to avoid a duplicate. It might require send-email learning about the option to avoid doing its own in-body-from management. If you only care about send-email, it might be easier to just add the option there. -Peff
WARNING: multiple messages have this Message-ID (diff)
From: Jeff King <peff@peff.net> To: Eric Blake <eblake@redhat.com> Cc: berrange@redhat.com, stefanha@gmail.com, Christian Schoenebeck <qemu_oss@crudebyte.com>, Greg Kurz <groug@kaod.org>, qemu-devel@nongnu.org, dgilbert@redhat.com, antonios.motakis@huawei.com, git@vger.kernel.org Subject: Re: [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Date: Mon, 9 Sep 2019 10:25:12 -0400 [thread overview] Message-ID: <20190909142511.GA20726@sigill.intra.peff.net> (raw) In-Reply-To: <305577c2-709a-b632-4056-6582771176ac@redhat.com> On Mon, Sep 09, 2019 at 09:05:45AM -0500, Eric Blake wrote: > > But as you can already read from the manual, the overall behaviour of git > > regarding a separate "From:" line in the email body was intended solely for > > the use case sender != author. So in practice (at least in my git version) git > > always makes a raw string comparison between sender (name and email) string > > and author string and only adds the separate From: line to the body if they > > differ. > > > > Hence also "git format-patch --from=" only works here if you use a different > > author string (name and email) there, otherwise on a perfect string match it > > is simply ignored and you end up with only one "From:" in the email header. > > git folks: > > How hard would it be to improve 'git format-patch'/'git send-email' to > have an option to ALWAYS output a From: line in the body, even when the > sender is the author, for the case of a mailing list that munges the > mail headers due to DMARC/DKIM reasons? It wouldn't be very hard to ask format-patch to just handle this unconditionally. Something like: diff --git a/pretty.c b/pretty.c index e4ed14effe..9cf79d7874 100644 --- a/pretty.c +++ b/pretty.c @@ -451,7 +451,8 @@ void pp_user_info(struct pretty_print_context *pp, map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); if (cmit_fmt_is_mail(pp->fmt)) { - if (pp->from_ident && ident_cmp(pp->from_ident, &ident)) { + if (pp->always_use_in_body_from || + (pp->from_ident && ident_cmp(pp->from_ident, &ident))) { struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, "From: "); but most of the work would be ferrying that option from the command line down to the pretty-print code. That would work in conjunction with "--from" to avoid a duplicate. It might require send-email learning about the option to avoid doing its own in-body-from management. If you only care about send-email, it might be easier to just add the option there. -Peff
next prev parent reply other threads:[~2019-09-09 14:25 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-22 19:53 [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Christian Schoenebeck via Qemu-devel 2019-08-22 19:28 ` [Qemu-devel] [PATCH v6 1/4] 9p: Treat multiple devices on one export as an error Christian Schoenebeck via Qemu-devel 2019-08-29 16:27 ` Greg Kurz 2019-09-01 17:38 ` Christian Schoenebeck via Qemu-devel 2019-08-22 19:33 ` [Qemu-devel] [PATCH v6 2/4] 9p: Added virtfs option 'multidevs=remap|forbid|warn' Christian Schoenebeck via Qemu-devel 2019-08-29 16:55 ` Greg Kurz 2019-09-01 18:40 ` Christian Schoenebeck via Qemu-devel 2019-09-02 10:16 ` Greg Kurz 2019-09-02 21:07 ` Christian Schoenebeck via Qemu-devel 2019-08-30 12:22 ` Greg Kurz 2019-09-01 18:56 ` Christian Schoenebeck via Qemu-devel 2019-09-02 11:49 ` Greg Kurz 2019-09-02 21:25 ` Christian Schoenebeck via Qemu-devel 2019-08-22 19:44 ` [Qemu-devel] [PATCH v6 3/4] 9p: stat_to_qid: implement slow path Christian Schoenebeck via Qemu-devel 2019-08-22 19:49 ` [Qemu-devel] [PATCH v6 4/4] 9p: Use variable length suffixes for inode remapping Christian Schoenebeck via Qemu-devel 2019-08-22 22:18 ` [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions no-reply 2019-08-29 17:02 ` Greg Kurz 2019-09-01 19:28 ` Christian Schoenebeck via Qemu-devel 2019-09-02 15:34 ` Greg Kurz 2019-09-02 22:29 ` Christian Schoenebeck via Qemu-devel 2019-09-03 19:11 ` [Qemu-devel] DMARC/DKIM and qemu-devel list settings Ian Kelling 2019-09-04 8:13 ` Daniel P. Berrangé 2019-09-04 14:19 ` Ian Kelling 2019-09-04 14:30 ` Peter Maydell 2019-09-09 11:47 ` Markus Armbruster 2019-09-10 7:23 ` Stefan Hajnoczi 2019-09-03 19:38 ` [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Eric Blake 2019-09-04 13:02 ` Christian Schoenebeck via Qemu-devel 2019-09-05 12:25 ` Christian Schoenebeck via Qemu-devel 2019-09-05 12:59 ` Greg Kurz 2019-09-23 11:27 ` Christian Schoenebeck via 2019-09-09 14:05 ` Eric Blake 2019-09-09 14:05 ` Eric Blake 2019-09-09 14:25 ` Jeff King [this message] 2019-09-09 14:25 ` Jeff King 2019-09-23 11:19 ` Christian Schoenebeck 2019-09-23 11:19 ` Christian Schoenebeck via 2019-09-23 22:24 ` Jeff King 2019-09-23 22:24 ` Jeff King 2019-09-24 9:03 ` git format.from (was: 9p: Fix file ID collisions) Christian Schoenebeck 2019-09-24 9:03 ` Christian Schoenebeck via 2019-09-24 21:36 ` Jeff King 2019-09-24 21:36 ` Jeff King 2019-09-09 18:41 ` [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Junio C Hamano 2019-09-09 18:41 ` 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=20190909142511.GA20726@sigill.intra.peff.net \ --to=peff@peff.net \ --cc=antonios.motakis@huawei.com \ --cc=berrange@redhat.com \ --cc=dgilbert@redhat.com \ --cc=eblake@redhat.com \ --cc=git@vger.kernel.org \ --cc=groug@kaod.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu_oss@crudebyte.com \ --cc=stefanha@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.