On 7/15/26 7:01 PM, Tom Rini wrote:
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.
Thanks !
