Linux maintainer tooling and workflows
 help / color / mirror / Atom feed
From: Matthieu Baerts <matthieu.baerts@tessares.net>
To: "Kernel.org Tools" <tools@linux.kernel.org>
Cc: Matthieu Baerts <matthieu.baerts@tessares.net>,
	 Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Subject: [PATCH b4 RFC 0/3] "b4 prep --new --fork-point" is not clear to me
Date: Mon, 06 Feb 2023 19:23:01 +0100	[thread overview]
Message-ID: <20230206-b4-prep-fork-point-as-base-branch-v1-0-2732e0c32f5d@tessares.net> (raw)

This is an RFC because when looking at the code, I'm not sure I'm using
this command properly.

For me, using '--fork-point' is useful to avoid switching to another
branch before calling 'b4 prep -n', no? On my side, it is especially
useful if this other branch is not a local one, e.g.

  b4 prep -n foo -f linus/master

It seems doing what I want by creating the new b4 branch on top of
'linus/master' one. Except that b4 was using the current branch as 'base
branch'.

I thought it was a bug and I just changed the line that was problematic
for me (patch 1).

But when I looked at the code just above, I didn't find a reason why
the current branch is also used there with the other strategies. I'm
sure I'm missing something there but just in case, I did this
modification (patch 2). Maybe all we need is to make sure the given
argument is a branch (patch 3)?

Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Matthieu Baerts (3):
      ez: prep -n: use fork-point as base branch
      ez: prep -n: always use fork-point as a base
      ez: prep -n: validate fork-point is a branch

 b4/ez.py | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)
---
base-commit: ada3021c64dd484e53219eb3af55da6c8f25d0ec
change-id: 20230206-b4-prep-fork-point-as-base-branch-377bb2b2dd68

Best regards,
-- 
Matthieu Baerts <matthieu.baerts@tessares.net>


             reply	other threads:[~2023-02-06 18:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-06 18:23 Matthieu Baerts [this message]
2023-02-06 18:23 ` [PATCH b4 RFC 1/3] ez: prep -n: use fork-point as base branch Matthieu Baerts
2023-02-06 18:23 ` [PATCH b4 RFC 2/3] ez: prep -n: always use fork-point as a base Matthieu Baerts
2023-02-06 18:23 ` [PATCH b4 RFC 3/3] ez: prep -n: validate fork-point is a branch Matthieu Baerts

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=20230206-b4-prep-fork-point-as-base-branch-v1-0-2732e0c32f5d@tessares.net \
    --to=matthieu.baerts@tessares.net \
    --cc=konstantin@linuxfoundation.org \
    --cc=tools@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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).