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 1/3] ez: prep -n: use fork-point as base branch
Date: Mon, 06 Feb 2023 19:23:02 +0100 [thread overview]
Message-ID: <20230206-b4-prep-fork-point-as-base-branch-v1-1-2732e0c32f5d@tessares.net> (raw)
In-Reply-To: <20230206-b4-prep-fork-point-as-base-branch-v1-0-2732e0c32f5d@tessares.net>
When creating a new branch with a fork point, use it as base branch.
Without that, when using:
b4 prep -n ${NEW_SERIES_NAME} -f ${FORK_POINT}
The branch ${NEW_SERIES_NAME} will be created on top of ${FORK_POINT}
but the current branch will be set as base branch. ${FORK_POINT} can be
quite different from the current branch.
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
b4/ez.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/b4/ez.py b/b4/ez.py
index 74afddc..2722c6c 100644
--- a/b4/ez.py
+++ b/b4/ez.py
@@ -345,7 +345,7 @@ def start_new_series(cmdargs: argparse.Namespace) -> None:
basebranch = mybranch
break
else:
- basebranch = mybranch
+ basebranch = cmdargs.fork_point
if basebranch is None:
logger.critical('CRITICAL: fork-point %s is not on the current branch.', cmdargs.fork_point)
--
2.38.1
next prev parent 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 [PATCH b4 RFC 0/3] "b4 prep --new --fork-point" is not clear to me Matthieu Baerts
2023-02-06 18:23 ` Matthieu Baerts [this message]
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-1-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).