From: Tom Rini <trini@konsulko.com>
To: Marek Vasut <marex@nabladev.com>
Cc: u-boot@lists.denx.de, u-boot-board-maintainers@lists.denx.de,
u-boot-custodians@lists.denx.de
Subject: Re: [ANN] Updating branching scheme to use "main"
Date: Wed, 15 Jul 2026 11:01:51 -0600 [thread overview]
Message-ID: <20260715170151.GJ749385@bill-the-cat> (raw)
In-Reply-To: <a68ee92c-48b6-470a-be97-1110f3ea5abe@nabladev.com>
[-- Attachment #1: Type: text/plain, Size: 1534 bytes --]
On Wed, Jul 15, 2026 at 06:22:16PM +0200, Marek Vasut wrote:
> On 7/8/26 6:19 PM, Tom Rini wrote:
>
> Hello Tom,
>
> > As part of migrating from source.denx.de and over to
> > git.u-boot-project.org, I think it's time to change the branching scheme
> > from master or next to main or next. Since we'll be changing the URLs, I
> > don't think we need to (and I'm not sure we can automatically) have a
> > period where both exist. Thanks!
> It would be helpful for legacy build system integrations to keep the
> 'master' branch around and mark it as "protected" or some such, so it cannot
> be updated after certain cutoff point.
>
> OE fetcher for example checks whether a specific commit SHA exists on a
> branch unless that is inhibited via 'nobranch=1'.
>
> It was suggested that the 'master' branch can be pushed with commits up to
> v2026.07 release, and then stop being updated, while the 'main' branch will
> be updated going forward. I think this would cover all the old build system
> integrations without causing them too much breakage.
>
> For example gstreamer kept the old 'master' branch around, stopped updating
> it, and then kept updating the 'main' branch going forward, which to me
> seems like the optimal compromise:
>
> https://gitlab.freedesktop.org/gstreamer/gstreamer/-/tree/master?ref_type=heads
Thanks for looking in to this. It's not hard to have "master" stop at
v2026.07 and be protected from pushes, etc, so I've done that now on
git.u-boot-project.org.
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-07-15 17:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-08 16:19 [ANN] Updating branching scheme to use "main" Tom Rini
2026-07-15 16:22 ` Marek Vasut
2026-07-15 17:01 ` Tom Rini [this message]
2026-07-15 17:42 ` Marek Vasut
2026-07-19 18:22 ` Tom Rini
2026-07-23 8:17 ` Rasmus Villemoes
2026-07-23 16:46 ` Tom Rini
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=20260715170151.GJ749385@bill-the-cat \
--to=trini@konsulko.com \
--cc=marex@nabladev.com \
--cc=u-boot-board-maintainers@lists.denx.de \
--cc=u-boot-custodians@lists.denx.de \
--cc=u-boot@lists.denx.de \
/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.