Hello all. As was mentioned in the 4.21 release notes, coreboot has switched the default branch from "master" to "main".
We're currently in the process of updating the documentation and scripts in the coreboot repository, but anyone running scripts of their own will need to update them to point to the main branch.
To change your coreboot local tree, see what's in your git config: /work/git/coreboot ((dc75d3e6c1...))% git config -l | grep master remote.origin.push=HEAD:refs/for/master branch.master.remote=origin branch.master.merge=refs/heads/master branch.master.rebase=true
You can edit your .git/config file to change these to main, or do it from the command line:
git config remote.origin.push HEAD:refs/for/main git config --remove-section branch.master git config branch.main.remote origin git config branch.main.merge refs/heads/main git config branch.main.rebase true
In general, this name change shouldn't create any significant impact. Basically anything you previously used "master" for, you should change to "main".
Instead of using "push origin HEAD:refs/for/master" you'll now use "push origin HEAD:refs/for/main".
Instead of checking out or rebasing on master, you'll now use main.
All of the open coreboot patches in gerrit have been updated to be pushed to main when merged. The master branch will no longer accept pushes.
We will keep the master branch in sync with the main branch for a while so that everyone has time to switch any scripts that are running over to the main branch, but this will be discontinued at some point - probably around the end of November, after the 4.22 release.
If you have any questions or issues about how to do things relating to this change, please feel free to reply to this message and we'll try to help solve any issues.
Martin
Hi Martin,
On Sat, 2023-09-09 at 18:20 -0600, coreboot org wrote:
The master branch will no longer accept pushes.
it seems people are still able to use refs/for/master. Some patches were just pushed for master today, but they are already rebased to the main branch now. Can we prevent that or can we only prevent submissions to the master branch?
Felix
12. September 2023 17:59, "Felix Singer" felixsinger@posteo.net schrieb:
it seems people are still able to use refs/for/master. Some patches were just pushed for master today, but they are already rebased to the main branch now. Can we prevent that or can we only prevent submissions to the master branch?
I extended the ACLs to catch more cases. Other than that, we'll monitor the situation and move things around if patches end up in the wrong place.
Patrick