View Issue Details

IDProjectCategoryView StatusLast Update
0004333Composrcorepublic2024-07-25 01:05
ReporterChris GrahamAssigned To 
SeverityFeature-request 
Status non-assignedResolutionopen 
Product Version 
Fixed in Version 
Summary0004333: Rename master branch to main in git (on hold)
DescriptionThere is a wide movement to rename the master git branch to main, by convention.

This is because of a perception that 'master' in master branch refers to a master/slave relationship, which is normalizing a metaphor of something horrific that should be kept to the history books.

1) ALTERING CODE

I have done some of the work for this already, altering our code to make it more easy to put in a new stable branch name.
We just need to change the master references in THANKS.md and version.php.

2) RENAMING ACTUAL BRANCH

These commands should do it:
git checkout master
git branch -m main
git push origin :master
git push origin main:refs/heads/main

3) OTHER REPOSITORIES

Do this across any other repositories we are maintaining for the long-term, not just the main Composr repository.

4) SEARCH TRACKER

Fix any references to 'master' on the tracker.
Additional InformationPersonally I feel the renaming is silly, given that the name 'master' is nothing to do with master/slave, and a normal English word used for many purposes (e.g. master's degree, headmaster, mast on a ship, master copy, etc). However my personal feelings are irrelevant because Git, GitHub, BitBucket, and GitLab, are all pressing forward with the rename and we should stick to convention. And honestly it doesn't hurt much, and 'main' is less characters to type.

This issue is on hold until GitLab:
a) makes URLs to 'master' branch files (etc) redirect to the configured main branch. GitHub have announced this for year end, and I do think GitLab will do it too.
b) automatically migrates stuff like merge requests on 'master' to 'main' (ditto)
TagsRoadmap: Over the horizon
Time estimation (hours)2
Sponsorship open

Relationships

related to 0005484 resolvedPatrick Schmalstig Pedantic: Replace all uses of the word "master" 

Activities

Chris Graham

2022-07-28 02:58

administrator   ~0007398

Discussion on Git mailing list (they are slowly changing to main):
https://lore.kernel.org/git/pull.656.v4.git.1593009996.gitgitgadget@gmail.com/

GitLab's writeup:
https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/

Issue History

Date Modified Username Field Change
2020-07-29 02:47 Chris Graham New Issue
2020-07-29 02:48 Chris Graham Tag Attached: Roadmap: v12
2022-07-28 02:58 Chris Graham Note Added: 0007398
2024-03-26 00:58 Patrick Schmalstig Tag Renamed Roadmap: v12 => Roadmap: Over the horizon
2024-07-25 01:05 Chris Graham Relationship added related to 0005484