The switch from master to main has been successfully completed.
Stefan
On Sun, Sep 24, 2023 at 1:11 PM Stefan Reinauer stefan.k.reinauer@gmail.com wrote:
quick note, the transition was delayed on Wednesday. I will work on this now, and will send out another mail upon completion.
Stefan
On Sun, Sep 17, 2023 at 1:34 PM Stefan Reinauer < stefan.k.reinauer@gmail.com> wrote:
Hello all.
After coreboot's git repository recently switched to use the default branch name "main" instead of "master", we will also move flashrom over soon to keep all repositories on coreboot.org/flashrom.org consistent.
My plan is to make this change on Wednesday September 20th at 20:00 (8pm) PDT. This is Thursday 5am CEST.
After the switch I will send another email here to announce the change.
Once the default branch has been switched over, you will need to update your local git repository:
To change your flashrom local tree, see what's in your git config:
/work/git/flashrom $ 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 then use "push origin HEAD:refs/for/main".
Instead of checking out or rebasing on master, you'll then use main.
All of the open flashrom patches in gerrit will be updated to be pushed to main when merged. The master branch will be removed when the change is complete.
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.
Stefan (on behalf of coreboot.org/flashrom.org admin team)