Linux maintainer tooling and workflows
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: Mark Brown <broonie@kernel.org>,
	users@linux.kernel.org, tools@linux.kernel.org
Subject: Re: b4 bugs / future improvements
Date: Wed, 19 Oct 2022 10:04:39 +0200	[thread overview]
Message-ID: <20221019080439.cwwiycfdn4b4evvv@houat> (raw)
In-Reply-To: <20221018203749.o4i5h2qt6artzezx@nitro.local>

[-- Attachment #1: Type: text/plain, Size: 1831 bytes --]

On Tue, Oct 18, 2022 at 04:37:49PM -0400, Konstantin Ryabitsev wrote:
> On Tue, Oct 18, 2022 at 09:29:44PM +0100, Mark Brown wrote:
> > > >    - It's a bit tedious to do. One needs to rebase and then edit the
> > > >      cover letter by hand without b4 being involved. I don't think doing
> > > >      the rebase interface all over again is reasonable, but maybe we
> > > >      could add a subcommand to set a new base?
> > 
> > > Interesting. I'm not sure I fully understand the problem, but then all my
> > > rebase tests were all very simple cases of running "git rebase <newtag>"
> > 
> > > Is there a reason why you have to manually edit the cover letter after a
> > > rebase?
> > 
> > If you're doing an inter-version changelog it's common to say something
> > like "rebased against foo" in there.  It's a bit clearer about things
> > than base-commit.
> 
> No, I don't think that's what Maxime means -- "rebased against foo" can be
> done using "b4 prep --edit-cover".

Yeah, I'm manually editing the JSON part. But tbf, I don't really know
why I started doing it, so it might be fixed for a while, or never an
issue in the first place.

> I think there's two things going on:
> 
> 1. he's using a different cover strategy that requires base-branch tracking
> 2. he's rebasing on a different branch, as opposed to a newer tag within the
>    same branch

If it causes any issue, then it could be the reason yeah. I do rebase
across different branches from time to time, so it might be why I
started doing so.

> That would indeed be as cumbersome as described (and why I'm using the "cover
> letter as an empty commit at the start of the series" strategy as the
> default).
> 
> Maxime, is that correct? I assume you're using "tip-commit"?

I'm using the commit strategy

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

  reply	other threads:[~2022-10-19  8:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-18 15:36 b4 bugs / future improvements Maxime Ripard
2022-10-18 20:18 ` Konstantin Ryabitsev
2022-10-18 20:29   ` Mark Brown
2022-10-18 20:37     ` Konstantin Ryabitsev
2022-10-19  8:04       ` Maxime Ripard [this message]
2022-10-19 19:16         ` Konstantin Ryabitsev
2022-10-20  8:41           ` Maxime Ripard
2022-10-19  2:05   ` Rob Herring
2022-10-19  8:01   ` Maxime Ripard
2022-10-19 19:21     ` Konstantin Ryabitsev
2022-10-20  8:49     ` Maxime Ripard
2022-11-09 14:14       ` Maxime Ripard
2022-11-29 17:14         ` Konstantin Ryabitsev
2022-11-29 20:52           ` Maxime Ripard
2023-05-05  7:17       ` 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=20221019080439.cwwiycfdn4b4evvv@houat \
    --to=maxime@cerno.tech \
    --cc=broonie@kernel.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