[ANN] Updating branching scheme to use "main"

[ANN] Updating branching scheme to use "main"

[Tom Rini]

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

Hey all,

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!

-- 
Tom

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

Re: [ANN] Updating branching scheme to use "main"

[Marek Vasut]

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

Re: [ANN] Updating branching scheme to use "main"

[Tom Rini]

[-- 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 --]

Re: [ANN] Updating branching scheme to use "main"

[Marek Vasut]

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 !

Re: [ANN] Updating branching scheme to use "main"

[Tom Rini]

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

On Wed, Jul 08, 2026 at 10:19:45AM -0600, Tom Rini wrote:

> Hey all,
> 
> 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!

This is now in effect. The "main" branch on
https://git.u-boot-project.org/u-boot/u-boot is up to date, and the
"master" branch (per Marek's suggestion) is on v2026.07. The GitHub,
Gitlab.com and also source.denx.de repositories match this.

On a related note, that I'll emphasize more stand-alone, it is best to
switch over to https://git.u-boot-project.org/u-boot/u-boot for all of
your git-based needs.

-- 
Tom

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

Re: [ANN] Updating branching scheme to use "main"

[Rasmus Villemoes]

On Sun, Jul 19 2026, "Tom Rini" <trini@konsulko.com> wrote:

> On Wed, Jul 08, 2026 at 10:19:45AM -0600, Tom Rini wrote:
>
>> Hey all,
>> 
>> 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!
>
> This is now in effect. The "main" branch on
> https://git.u-boot-project.org/u-boot/u-boot is up to date, and the
> "master" branch (per Marek's suggestion) is on v2026.07. The GitHub,
> Gitlab.com and also source.denx.de repositories match this.

Tip: If, like me, you are heavily relying on tab-completion, you will
now experience that

  git log up<TAB>m<TAB>

no longer tab-completes to upstream/master, nor, as it now should,
upstream/main, because both exist, so it only ends up showing
"upstream/ma".

You can easily configure git to ignore the "master" branch on the
upstream remote. First, delete the current remote-tracking branch:

  git branch --remote --delete upstream/master

Then in your repository's .git/config, make sure the remote.upstream
section is something like

[remote "upstream"]
	url = https://git.u-boot-project.org/u-boot/u-boot.git
	fetch = +refs/heads/*:refs/remotes/upstream/*
	fetch = ^refs/heads/master

i.e. add the negative refspec '^refs/heads/master'. Then "git remote
update", "git fetch upstream" and similar won't create that
remote-tracking branch again.

(Of course, replace "upstream" by "origin" or whatever your remote name
is for the upstream repository.)

Rasmus

Re: [ANN] Updating branching scheme to use "main"

[Tom Rini]

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

On Thu, Jul 23, 2026 at 10:17:28AM +0200, Rasmus Villemoes wrote:
> On Sun, Jul 19 2026, "Tom Rini" <trini@konsulko.com> wrote:
> 
> > On Wed, Jul 08, 2026 at 10:19:45AM -0600, Tom Rini wrote:
> >
> >> Hey all,
> >> 
> >> 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!
> >
> > This is now in effect. The "main" branch on
> > https://git.u-boot-project.org/u-boot/u-boot is up to date, and the
> > "master" branch (per Marek's suggestion) is on v2026.07. The GitHub,
> > Gitlab.com and also source.denx.de repositories match this.
> 
> Tip: If, like me, you are heavily relying on tab-completion, you will
> now experience that
> 
>   git log up<TAB>m<TAB>
> 
> no longer tab-completes to upstream/master, nor, as it now should,
> upstream/main, because both exist, so it only ends up showing
> "upstream/ma".
> 
> You can easily configure git to ignore the "master" branch on the
> upstream remote. First, delete the current remote-tracking branch:
> 
>   git branch --remote --delete upstream/master
> 
> Then in your repository's .git/config, make sure the remote.upstream
> section is something like
> 
> [remote "upstream"]
> 	url = https://git.u-boot-project.org/u-boot/u-boot.git
> 	fetch = +refs/heads/*:refs/remotes/upstream/*
> 	fetch = ^refs/heads/master
> 
> i.e. add the negative refspec '^refs/heads/master'. Then "git remote
> update", "git fetch upstream" and similar won't create that
> remote-tracking branch again.
> 
> (Of course, replace "upstream" by "origin" or whatever your remote name
> is for the upstream repository.)

That's a good tip, thank you! It should probably get put in a doc
somewhere for others to reference. I'll try and remember that as part of
also needing to likely update some other docs.

-- 
Tom

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