All of lore.kernel.org
 help / color / mirror / Atom feed
From: "James Bottomley" <James.Bottomley@HansenPartnership.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>,
	toke@toke.dk,
	Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
	users@linux.kernel.org,  tools@linux.kernel.org,
	Jens Axboe <axboe@kernel.dk>
Subject: Re: [kernel.org users] b4: encouraging using the cover letter in merge commits?
Date: Sat, 19 Dec 2020 13:57:06 -0800	[thread overview]
Message-ID: <f680b34d8bb711ce37627253d21478b02cdc5bee.camel@HansenPartnership.com> (raw)
In-Reply-To: <20201219214351.GC363602@kernel.org>

On Sat, 2020-12-19 at 18:43 -0300, Arnaldo Carvalho de Melo wrote:
> Em Sat, Dec 19, 2020 at 01:01:43PM -0800, James Bottomley escreveu:
> > On Sat, 2020-12-19 at 17:48 -0300, Arnaldo Carvalho de Melo wrote:
> > > Em Sat, Dec 19, 2020 at 11:03:59AM -0800, James Bottomley
> > > escreveu:
> > > > On Sat, 2020-12-19 at 11:57 -0700, Jonathan Corbet wrote:
> > [...]
> > > > > We're getting into minor details, though.  If The Community
> > > > > were to decide somehow that link tags are The Preferred Way,
> > > > > I would not kick and scream too hard before going along with
> > > > > it.  Unless I were in one of my screaming moods at the time,
> > > > > of course.
> > > > 
> > > > I'm not really seeking a preferred way, I'm just asking why
> > > > people who now use the link tag and linear series should
> > > > change.  As long as we can agree the link tag is fine and
> > > > there's really no additional information that needs capturing,
> > > > I think we can leave it to maintainer discretion whether they
> > > > prefer merge per series or linear.
> > > 
> > > My question is: is the information in the cover letter useful? 
> > 
> > I think it is but it's not vital to understanding individual
> > commits, which should be properly described.
> 
> Agreed.
>  
> > > If it is, why not have it preserved in the main repo?
> > 
> > Because the link tag supplies it and works with current linear
> > workflows.  To mandate storing the cover letter, people using
> > linear workflows have to move to a new method.
> 
> But that points to outside the main repository.

Yes, but I don't see this as a problem.  The whole point of having
infrastructure which dereferences msgid links is that we can use it.

If this is an argument about having all the information in the repo, I
really don't think it's worth it.  All the nuance is stored in the
email trail, so simply pointing at it seems far easier.  Also, however
carefully you harvest the cover letter and relevant details into the
merge commit, you'll always miss something sometimes.  I think even net
admits this by doing both cover letter and link tag.

> > >  The owner of such repositories asks us to describe what is in
> > > the series, sign it, and then this gets dropped?
>  
> > Um, well we don't have people sign the cover letter.  We just have
> > it describe the current series and its history.  Plus it doesn't
> > get dropped ... it's in the email history, pointed to by the link
> > tag, which is often a lot richer than the bare cover letter anyway.
> 
> I agree the link tag is valuable, but it points to outside the repo.
>  
> > The main point is we have two pieces of information:  The precise
> > description of what each commit does, which should be in the
> > tree.  And
> 
> I often have this problem with submitters: things that should be at
> individual commits are grouped in the cover letter, makes my life
> harder, as I'll end up having more work to do to move that to where
> it belong: individual commits.

Well, we tend to make them do a rewrite.  Although I have to confess a
lot of it, after upteen iterations of commit messages which reproduce
the C code in slightly different English each time, becomes "get the
series into shape and we'll write the commit text for you" (or in the
case of SCSI, Martin will rewrite the commit message for you ...).

But the danger of having the cover letter is precisely that you are
less apt to be strict about the commit message, which can be confusing
for someone else when looking for a bug because they'll be going on the
commit text.

> But we are digressing, assuming what is in the cover letter is not
> what should be in individual commits but has value, why not have it
> preserved upstream?

Because on its own it's incomplete and we have other mechanisms to keep
the full historical record.

James



  reply	other threads:[~2020-12-19 21:57 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-18 21:32 b4: encouraging using the cover letter in merge commits? Toke Høiland-Jørgensen
2020-12-18 22:09 ` Konstantin Ryabitsev
2020-12-19 12:29   ` Toke Høiland-Jørgensen
2020-12-18 22:38 ` [kernel.org users] " James Bottomley
2020-12-19 12:34   ` Toke Høiland-Jørgensen
2020-12-19 17:03     ` James Bottomley
2020-12-19 17:21       ` Jakub Kicinski
2020-12-19 17:32         ` James Bottomley
2020-12-21 19:05         ` Jason Gunthorpe
2020-12-21 21:13           ` Michal Kubeček
2020-12-21 21:30           ` Arnaldo Carvalho de Melo
2020-12-22  6:30             ` Leon Romanovsky
2020-12-22  8:14               ` Geert Uytterhoeven
2020-12-22 12:36                 ` Leon Romanovsky
2021-01-05 13:38                 ` Jason Gunthorpe
2020-12-19 18:45       ` Jonathan Corbet
2020-12-19 18:49         ` James Bottomley
2020-12-19 18:57           ` Jonathan Corbet
2020-12-19 19:03             ` James Bottomley
2020-12-19 20:48               ` Arnaldo Carvalho de Melo
2020-12-19 21:01                 ` James Bottomley
2020-12-19 21:43                   ` Arnaldo Carvalho de Melo
2020-12-19 21:57                     ` James Bottomley [this message]
2020-12-19 22:17                       ` Arnaldo Carvalho de Melo
2020-12-19 23:34                         ` James Bottomley
2020-12-21 17:34       ` [tools] " Mark Brown

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=f680b34d8bb711ce37627253d21478b02cdc5bee.camel@HansenPartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=acme@kernel.org \
    --cc=axboe@kernel.dk \
    --cc=corbet@lwn.net \
    --cc=konstantin@linuxfoundation.org \
    --cc=toke@toke.dk \
    --cc=tools@linux.kernel.org \
    --cc=users@linux.kernel.org \
    /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 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.