Re: [Qemu-devel] [PATCH v6 0/4] 9p: Fix file ID collisions

From: Jeff King <peff@peff.net>
Date: Sep 23, 2019, 22:24 UTC
Message-ID: <20190923222415.GA22495@sigill.intra.peff.net>
In-Reply-To: <56046367.TiUlWITyhT@silver>

On Mon, Sep 23, 2019 at 01:19:18PM +0200, Christian Schoenebeck wrote:

Show 19 quoted lines

> >  	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?

I think a config option would make sense, but we generally try to avoid adding a config option that doesn't have a matching command-line option.

I also think saving implementation work there is orthogonal. You can as easily make a global "always_use_in_body_from" as you can call a global config_get_bool("format-patch.always_use_in_body_from"). :)

And anyway, it's not _that_ much work to pass it around. At least as much would go into writing documentation and tests. One of the reasons I left the patch above as a sketch is that I'm not 100% convinced this is a useful feature. Somebody caring enough about it to make a real patch would send a signal there.

Show 11 quoted lines

> 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?

Yes, the resulting mail would be correct, in the sense that it could be applied just fine by git-am. But I think it would be uglier. IOW, I consider the presence of the in-body From to be a clue that something interesting is going on (like forwarding somebody else's patch). So from my perspective, it would just be useless noise. Other communities may have different opinions, though (I think I have seen some kernel folks always including all of the possible in-body headers, including Date). But it seems like it makes sense to keep both possibilities.

-Peff