All of lore.kernel.org
 help / color / mirror / Atom feed
From: "James Bottomley" <James.Bottomley@HansenPartnership.com>
To: toke@toke.dk, Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: users@linux.kernel.org, tools@linux.kernel.org,
	Jens Axboe <axboe@kernel.dk>,
	 Arnaldo Carvalho de Melo <acme@kernel.org>
Subject: Re: [kernel.org users] b4: encouraging using the cover letter in merge commits?
Date: Fri, 18 Dec 2020 14:38:45 -0800	[thread overview]
Message-ID: <bdffc35910338117c6ed66f6dfac2dc13d6ed03a.camel@HansenPartnership.com> (raw)
In-Reply-To: <877dpeol5w.fsf@toke.dk>

On Fri, 2020-12-18 at 22:32 +0100, Toke Høiland-Jørgensen via
linux.kernel.org wrote:
> Hi Konstantin
> 
> Jens, Arnaldo and I just had a twitter conversation[0] about cover
> letters and merge commits. Do you think it would be possible to
> support the 'include the cover letter text in the merge commit
> message' work flow in b4, maybe even encourage it?
> 
> I notice b4 will already save the cover letter along with the patch
> mbox file, but maybe it would be possible to automate the workflow
> some more? A 'b4 merge' command that wraps 'git merge' and pre-
> populates the commit message with the text from the cover letter? Or
> some other trick?

I think it's important to ask before we do this: why is the cover
letter relevant to a merge but not to a linear patch application (which
is what a lot of maintainers use b4 for)?  I think the answer is that
it's relevant to linear patches as well, which is why we use the Link
tag, but in that case shouldn't we be using the Link tag for merge
commits also?

We did toy with the idea of using empty commits for cover letters a
while ago but they got dropped because of the problems they cause (and
the fact that they get lost on a rebase), so it could be the answer to
why merge but not linear is because we have a vehicle for the former
but not the latter, but we should think about it first.

James



  parent reply	other threads:[~2020-12-18 22:38 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 ` James Bottomley [this message]
2020-12-19 12:34   ` [kernel.org users] " 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
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=bdffc35910338117c6ed66f6dfac2dc13d6ed03a.camel@HansenPartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=acme@kernel.org \
    --cc=axboe@kernel.dk \
    --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.