From: Christian Schoenebeck <qemu_oss@crudebyte.com>
To: qemu-devel@nongnu.org
Cc: Jeff King <peff@peff.net>, Eric Blake <eblake@redhat.com>,
berrange@redhat.com, stefanha@gmail.com,
Christian Schoenebeck <qemu_oss@crudebyte.com>,
Greg Kurz <groug@kaod.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, 23 Sep 2019 13:19:18 +0200 [thread overview]
Message-ID: <56046367.TiUlWITyhT@silver> (raw)
In-Reply-To: <20190909142511.GA20726@sigill.intra.peff.net>
On Montag, 9. September 2019 16:25:12 CEST Jeff King wrote:
> 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.
Would it simplify the changes in git if that would be made a
"git config [--global]" setting only? That is, would that probably simplify
that task to one simple function call there in pretty.c?
On the other hand, considering the already existing --from argument and
"format.from" config option:
https://git-scm.com/docs/git-config#Documentation/git-config.txt-formatfrom
Wouldn't it make sense to just drop the currently existing sender != author
string comparison in git and simply always add the "From:" line to the email's
body if "format.from yes" is used, instead of introducing a suggested 2nd
(e.g. "always-from") option? I mean sure automatically removing redundant
information in the generated emails if sender == author sounds nice on first
thought, but does it address anything useful in practice to justify
introduction of a 2nd related option?
Best regards,
Christian Schoenebeck
next prev parent reply other threads:[~2019-09-23 11:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1566503584.git.qemu_oss@crudebyte.com>
[not found] ` <46fe6c73-961f-d72a-77de-88491b6f223c@redhat.com>
[not found] ` <4642438.ai5u8AxThJ@silver>
[not found] ` <1897173.eDCz7oYxVq@silver>
2019-09-09 14:05 ` [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions Eric Blake
2019-09-09 14:25 ` Jeff King
2019-09-23 11:19 ` Christian Schoenebeck [this message]
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 21:36 ` Jeff King
2019-09-09 18:41 ` [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56046367.TiUlWITyhT@silver \
--to=qemu_oss@crudebyte.com \
--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=peff@peff.net \
--cc=qemu-devel@nongnu.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).