Linux maintainer tooling and workflows
 help / color / mirror / Atom feed
From: Jason Gunthorpe <jgg@ziepe.ca>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Konstantin Ryabitsev <konstantin@linuxfoundation.org>,
	James Bottomley <James.Bottomley@hansenpartnership.com>,
	users@linux.kernel.org, tools@linux.kernel.org
Subject: Re: b4 submit ready for beta testing
Date: Mon, 18 Jul 2022 20:10:12 -0300	[thread overview]
Message-ID: <20220718231012.GE5049@ziepe.ca> (raw)
In-Reply-To: <CAMuHMdWgjimmGRxP6kLK_mzv3Fo=5S6SjYj5sbk24eSHLWKZHg@mail.gmail.com>

On Mon, Jul 18, 2022 at 10:28:13PM +0200, Geert Uytterhoeven wrote:
> Hi Jason,
> 
> On Mon, Jul 18, 2022 at 8:17 PM Jason Gunthorpe <jgg@ziepe.ca> wrote:
> > On Sun, Jul 17, 2022 at 12:02:18PM -0400, Konstantin Ryabitsev wrote:
> > > Perhaps, but I also have other reasons to like using an empty commit for this.
> > > For example, it makes it very easy to mark where exactly our series
> > > starts.
> >
> > It is a good point, but it is backwards to how alot of people have
> > been doing things already for a long time..
> >
> > Putting the commit last makes it work a lot more like the usual
> > merge-commit approach to preserve the cover letter. Particularly if
> > you open the branch in any of the web viewers for git, or gitk you get
> > a very nice view of the cover letter explaining the branch followed by
> > the usual code in reverse patch order.
> 
> So a tag does sound like a logical place to store the cover letter,
> as merging the tag already pulls in the tag description into the
> merge commit?

See 'git-tag(1)' "On Re-tagging" for a discussion on why changing tags
that have been pushed is a bad idea. There are many troublesome
behaviors here.

Tags are not a solution to store the cover letter during development..

> > It would be nice to use merge commits to mark the series boundary, but
> > IMHO, the tooling is poor for this.
> 
> Tou can use "git tag --points-at" to find out if you already have a tag
> pointing to a commit.

tags are also bad because they don't auto track - when I rebase a
series with an empty cover commit everything stays in order
automatically. I can even shuffle around where patches are in a
multi-series work and break up a series with new cover letters rather
trivially with git rebase.

If I use a tag I have to remember to update the tag after every
rebase. It is much more likely to break down.

Jason

  reply	other threads:[~2022-07-18 23:10 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-16 14:29 b4 submit ready for beta testing Konstantin Ryabitsev
2022-07-16 14:43 ` James Bottomley
2022-07-16 14:56   ` Konstantin Ryabitsev
2022-07-16 16:10     ` Junio C Hamano
2022-07-16 16:55     ` James Bottomley
2022-07-16 17:14       ` Conor Dooley
2022-07-17 15:43         ` Konstantin Ryabitsev
2022-07-18 18:14           ` Jason Gunthorpe
2022-07-18 18:34             ` Luck, Tony
2022-07-17 16:02       ` Konstantin Ryabitsev
2022-07-18 18:17         ` Jason Gunthorpe
2022-07-18 20:28           ` Geert Uytterhoeven
2022-07-18 23:10             ` Jason Gunthorpe [this message]
2022-07-19  7:02               ` Geert Uytterhoeven
2022-07-19 12:09                 ` Mark Brown
2022-07-19 12:28                   ` Geert Uytterhoeven
2022-07-20 13:06                     ` Sudeep Holla
2022-07-19 12:44                   ` James Bottomley
2022-07-19 12:51                     ` Geert Uytterhoeven
2022-07-19 13:11                     ` Michael S. Tsirkin
2022-07-19 14:14                     ` Mark Brown
2022-07-19 12:34                 ` Jason Gunthorpe
2022-07-19 12:47                   ` Geert Uytterhoeven
2022-07-19 13:00                     ` Jason Gunthorpe
2022-07-19 13:16                       ` Geert Uytterhoeven
2022-07-19 13:59                       ` Maxime Ripard
2022-07-19 15:32                         ` Jason Gunthorpe
2022-07-19 16:07                           ` Konstantin Ryabitsev
2022-07-19 16:18                           ` Rob Herring
2022-07-19 13:01           ` James Bottomley
2022-07-19 15:34             ` Jason Gunthorpe
2022-07-19 15:38               ` James Bottomley
2022-07-19 15:47                 ` Jason Gunthorpe
2022-07-25 12:16         ` Michael S. Tsirkin
2022-07-17  9:58     ` Geert Uytterhoeven
2022-07-17 15:40       ` Konstantin Ryabitsev
2022-07-18  8:49 ` Maxime Ripard
2022-07-18 12:38   ` Paolo Bonzini
2022-07-18 18:20     ` Jason Gunthorpe
2022-07-18 18:26       ` Konstantin Ryabitsev
2022-07-18 14:33   ` Konstantin Ryabitsev
2022-07-18 15:15     ` Maxime Ripard
2022-07-18 17:15 ` Rob Herring
2022-07-18 18:23   ` Konstantin Ryabitsev
2022-07-19 12:23 ` Mattijs Korpershoek
2022-07-19 13:09   ` Konstantin Ryabitsev
2022-07-20 18:48 ` Konstantin Ryabitsev
2022-07-20 19:24   ` Jason Gunthorpe
2022-07-20 19:40     ` Konstantin Ryabitsev
2022-07-20 19:55       ` Jason Gunthorpe
2022-07-20 20:06         ` Konstantin Ryabitsev
2022-07-20 23:13     ` Junio C Hamano
2022-07-20 23:23       ` Linus Torvalds
2022-07-20 23:39         ` Jason Gunthorpe
2022-07-20 23:40           ` Linus Torvalds
2022-07-20 23:42             ` Junio C Hamano
2022-07-21  0:02               ` Jason Gunthorpe
2022-07-21  0:54                 ` Theodore Ts'o
2022-07-21  2:31                   ` Dave Chinner
2022-07-21 13:07                     ` Jason Gunthorpe
2022-07-21 22:49                       ` Dave Chinner
2022-07-22  9:10                         ` Geert Uytterhoeven
2022-07-21  8:48                 ` Geert Uytterhoeven
2022-07-21 13:08                   ` Jason Gunthorpe
2022-07-26  8:37   ` Mattijs Korpershoek
2022-07-26 13:55     ` Paolo Bonzini
2022-07-26 14:06       ` Konstantin Ryabitsev
2022-07-26 14:27     ` Konstantin Ryabitsev
2022-07-26 14:54       ` Mattijs Korpershoek
2022-07-26 20:56         ` Konstantin Ryabitsev
2022-08-18 19:30           ` Conor Dooley
2022-08-18 20:12             ` Conor Dooley
2022-08-18 21:04               ` Konstantin Ryabitsev
2022-08-18 21:22                 ` Conor Dooley
2022-08-19 20:43             ` Konstantin Ryabitsev
2022-08-19 21:00               ` Conor Dooley
2022-07-26 13:11   ` Mattijs Korpershoek
2022-07-26 14:37     ` Konstantin Ryabitsev
2022-07-28 16:04   ` Maxime Ripard
2022-07-28 16:24     ` Konstantin Ryabitsev
2022-08-15 16:17       ` Maxime Ripard
2022-08-15 17:05         ` Konstantin Ryabitsev
2022-08-16  7:39           ` Maxime Ripard

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=20220718231012.GE5049@ziepe.ca \
    --to=jgg@ziepe.ca \
    --cc=James.Bottomley@hansenpartnership.com \
    --cc=geert@linux-m68k.org \
    --cc=konstantin@linuxfoundation.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox