Rename git master to main
Tor is in the process of updating repositories to rename the default branch from master
branch to main
. This is a ticket to collect and track the work needed on this for the anti-censorship team. We've already started using main
for new repositories. This ticket is to update existing ones. We have a lot of repositories, so this will be quite a task. Once we collect a full list, we'll make an announcement on the anti-censorship mailing list and weekly meeting.
We have several repositories that are maintained primarily by community members, and we will let these maintainers decide how to migrate branch names if they wish.
-
gettor-web (GitLab repo, git.tpo repo) -
gettor (GitLab repo, git.tpo repo) -
gettor-ansible (GitLab repo, git.tpo repo) -
snowflake (GitLab repo, git.tpo repo) -
snowflake-mobile (GitLab repo, git.tpo repo) -
snowflake-webext (GitLab repo, git.tpo repo) -
bridge-port-scan (GitLab repo, no git.tpo repo) -
bridgedb (GitLab repo, git.tpo repo) -
bridgedb-admin (GitLab repo, git.tpo repo) -
bridgestrap (GitLab repo, no git.tpo repo) -
censorship-analysis (GitLab repo, no git.tpo repo) -
docker-obfs4-bridge (GitLab repo, no git.tpo repo) -
emma (GitLab repo, no git.tpo repo) -
monit-configuration (GitLab repo, no git.tpo repo) -
private-bridges (private GitLab repo) -
rdsys (GitLab repo, no git.tpo repo) -
rdsys-admin (GitLab repo, no git.tpo repo) -
state-of-censorship (GitLab repo, no git.tpo repo) -
statsd-client (GitLab repo, no git.tpo repo) -
sysmon-configuration (GitLab repo, no git.tpo repo) -
wolpertinger (GitLab repo, no git.tpo repo) -
goptlib (not yet migrated to GitLab, git.tpo repo) Note: I don't have permissions to push new branches to the git.tpo repo
-
meek (not yet migrated to GitLab, git.tpo repo) Note: I don't have permissions to push new branches to the git.tpo repo
-
obfs4 (not yet migrated to GitLab, git.tpo repo)
Migration Checklist:
-
Update project contributors and maintainers about the plan -
Update any wiki pages that make references to branch names -
We'll need to check that our gitweb <--> gitlab mirrors push the right branches -
Do we have any scripts or documentation that rely on branch names? -
Anything we need to for tor-browser? (tpo/applications/tor-browser-build#40280 (closed)) Note: Snowflake is okay, but obfs4 and goptlib are set up to pull the master branch for builds
-
Will removing the master branch break existing Merge Requests? -
Translations!! I think these are hooked up to master branches
Other efforts at Tor:
- The default in GitLab is now main: tpo/tpa/gitlab#75 (closed)
- tpo/core/team#2 (closed)
- tpo/applications/team#3 (closed)