Cross-project-council: Rename master branches

Created on 29 Jan 2021  路  25Comments  路  Source: openjs-foundation/cross-project-council

There's broad community agreement that using the term "master" for the main branch of Git is harmful.

GitHub has made it easy to switch to another name. The community consensus seems to be to use "main" instead.

Proposal:

  • [x] Switch the default branch name of the GitHub openjs-foundation organization to "main".
  • [x] Rename master branches to main for all openjs-foundation repositories.

    • [x] openjs-foundation/TEST-EasyCLA

    • [x] openjs-foundation/artwork

    • [x] openjs-foundation/code-and-learn

    • [x] openjs-foundation/code-of-conduct

    • [x] openjs-foundation/cross-project-council

    • [x] openjs-foundation/meet

    • [x] openjs-foundation/open-office-hours

    • [x] openjs-foundation/openjsf-landscape

    • [x] openjs-foundation/project-status

    • [x] openjs-foundation/standards

    • [x] openjs-foundation/summit

    • [x] openjs-foundation/user-feedback

    • [x] openjs-foundation/silent-onboarding

    • [x] openjs-foundation/directory-private

  • [x] Through standard communication channel encourage all OpenJSF projects to do so as well.
  • [x] Possibly create a dedicated place where folks tasked to implement this change (not discuss its pertinence or value) can help each other, notably with handling tools or services that have hardcoded the "master" branch name as default branch.
  • [x] Eventually address issues uncovered by OpenJSF projects implementing this change at the foundation level (by reaching out to tools or services that make this change hard).
cross-project-council-agenda

Most helpful comment

I don't know if it's worth noting here, but I just finished changing all the default branches for all repos on the jQuery org to main.

All 25 comments

I think we should just rename them, with the new support to help move over PRs I think the impact on the work handled through CPC repos will be minimal.

Updated openjs-foundation/code-and-learn

Updated openjs-foundation/user-feedback

Updated openjs-foundation/openjsf-landscape

Updated openjs-foundation/project-status

openjs-foundation/artwork - default branch is already main

updated openjs-foundation/standards

Updated openjs-foundation/TEST-EasyCLA

openjs-foundation/meet is already main

updated openjs-foundation/code-of-conduct

updated openjs-foundation/summit

renamed openjs-foundation/open-office-hours

renamed openjs-foundation/silent-onboarding

openjs-foundation/directory-private primary branch was already main

Switch the default branch name of the GitHub openjs-foundation organization to "main".
This is already the default

updated openjs-foundation/cross-project-council

All repositories that did not already have main as the primary branch have been updated and the default for the org was already main.

The next step is to grep through the contents of all of the repositories and update any references from master to main:

I created this hackMD file to capture any issues, tips or guidance: https://hackmd.io/8sJrosPYSBi1uTM6C4GXjQ

Mass fast track request to get a number of the PRs referenced here landed: https://github.com/openjs-foundation/cross-project-council/issues/724

This issue remains open for the last three checkboxes on issue description:

  • Through standard communication channel encourage all OpenJSF projects to do so as well.
  • Possibly create a dedicated place where folks tasked to implement this change (not discuss its pertinence or value) can help each other, notably with handling tools or services that have hardcoded the "master" branch name as default branch.
  • Eventually address issues uncovered by OpenJSF projects implementing this change at the foundation level (by reaching out to tools or services that make this change hard).

I think to close this issue, considering the three bullet points left to do, we should:

  • send out an email to project maintainers suggesting they make the same change in their repos.
  • in that communication, suggest the #infra channel on Slack to discuss any issues
  • monitor that channel to see if there are any processes or tools we could create or use to make the process better.

That sounds like a great plan. We need someone to volunteer drafting an email.

Here's a proposal:

Dear Maintainers,

There's broad community agreement that using the term "master" for the main branch of Git is harmful.

GitHub has made it easy to switch to another name. The community consensus seems to be to use "main" instead.

We have recently completed transitioning all of the CPC repositories and encourage you to do the same.

We acknowledge renaming the main branch of repositories with complex CI/CD pipelines can be challenging and take time.

Feel free to reach out on Slack (#infra) to discuss any issues you might have.

The CPC

I don't know if it's worth noting here, but I just finished changing all the default branches for all repos on the jQuery org to main.

The template email, with a few minor edits, has been sent to our project leads!

I believe we can call this issue done as we've done it in our org.

Was this page helpful?
0 / 5 - 0 ratings

Related issues

mhdawson picture mhdawson  路  4Comments

bnb picture bnb  路  8Comments

mhdawson picture mhdawson  路  8Comments

mhdawson picture mhdawson  路  3Comments

MylesBorins picture MylesBorins  路  6Comments