changing "master" to "main" in tzdb development repository
Because the word "master" has negative connotations in English, I renamed the "master" branch to "main" in the tzdb development repository <https://github.com/eggert/tz>. This follows in the wake of GitHub's October change that makes the default branch "main" rather than "master", and GitHub's followup changes in January that made renaming relatively painless - for example, web requests for "master" are now redirected to "main" automatically <https://github.com/github/renaming/>. This renaming by GitHub is part of a broader change within the Git software ecosystem <https://sfconservancy.org/news/2020/jun/23/gitbranchname/>. This change affects neither past nor future releases of tzdb. It affects only the small number of direct accesses to the development repository for commits between releases. The idea is that on balance the small inconvenience for developers is outweighed by the advantage in reducing insensitivity overall. If you are a developer with a local clone of the tzdb repository, please adjust to this change by running the following shell commands: $ git branch -m master main $ git fetch origin $ git branch -u origin/main main I've done this for my own local clone of the repository. To document this change for tzdb newcomers, I installed the attached patch to the CONTRIBUTING file just before renaming the branch.
Date: Tue, 16 Mar 2021 18:41:05 -0700 From: Paul Eggert via tz <tz@iana.org> Message-ID: <4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu> I have no problem with the change (don't use git anyway), but | Because the word "master" has negative connotations in English, No, it doesn't. The issue is more that no-one wants to work on any of the real issues, which are hard, but changing the words people use is (or can be) relatively easy, so it is attractive to do that, rather than anything hard, and one can claim to have made progress, when absolutely nothing that matters has changed. kre
Robert Elz wrote in <22243.1615954740@jinx.noi.kre.to>: | Date: Tue, 16 Mar 2021 18:41:05 -0700 | From: Paul Eggert via tz <tz@iana.org> | Message-ID: <4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu> | |I have no problem with the change (don't use git anyway), but | || Because the word "master" has negative connotations in English, | |No, it doesn't. The issue is more that no-one wants to work on |any of the real issues, which are hard, but changing the words people |use is (or can be) relatively easy, so it is attractive to do that, |rather than anything hard, and one can claim to have made progress, |when absolutely nothing that matters has changed. Oh Mr. Robert Elz, i wholeheartly agree. Thankful the master thesis still remains, and will not become the mean main thesis. You know .. about the really important things.. --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt)
Robert Elz via tz said:
| Because the word "master" has negative connotations in English,
No, it doesn't. The issue is more that no-one wants to work on any of the real issues, which are hard, but changing the words people use is (or can be) relatively easy, so it is attractive to do that, rather than anything hard, and one can claim to have made progress, when absolutely nothing that matters has changed.
"Something must be done. This is something. Therefore this must be done." (From "Yes, Minister".) -- Clive D.W. Feather | If you lie to the compiler, Email: clive@davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646
Agree. This is profoundly silly. On 3/17/2021 12:19 AM, Robert Elz via tz wrote:
Date: Tue, 16 Mar 2021 18:41:05 -0700 From: Paul Eggert via tz <tz@iana.org> Message-ID: <4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu>
I have no problem with the change (don't use git anyway), but
| Because the word "master" has negative connotations in English,
No, it doesn't. The issue is more that no-one wants to work on any of the real issues, which are hard, but changing the words people use is (or can be) relatively easy, so it is attractive to do that, rather than anything hard, and one can claim to have made progress, when absolutely nothing that matters has changed.
kre
Donald -- This email has been checked for viruses by Avast antivirus software. https://www.avast.com/antivirus
I am quite left wing, and even i find this silly. I still call my son Master William. I like to believe he is a master of his own destiny. On 2021-03-17 11:20, Donald MacQueen via tz wrote:
Agree. This is profoundly silly.
On 3/17/2021 12:19 AM, Robert Elz via tz wrote:
Date: Tue, 16 Mar 2021 18:41:05 -0700 From: Paul Eggert via tz<tz@iana.org> Message-ID:<4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu>
I have no problem with the change (don't use git anyway), but
| Because the word "master" has negative connotations in English,
No, it doesn't. The issue is more that no-one wants to work on any of the real issues, which are hard, but changing the words people use is (or can be) relatively easy, so it is attractive to do that, rather than anything hard, and one can claim to have made progress, when absolutely nothing that matters has changed.
kre
Donald
<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaig...> Virus-free. www.avast.com <https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaig...>
<#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>
This seems like a clbuttic problem waiting to happen. David Braverman From: tz <tz-bounces@iana.org> On Behalf Of David Patte via tz Sent: Wednesday 17 March 2021 10:47 To: tz@iana.org Subject: Re: [tz] changing "master" to "main" in tzdb development repository I am quite left wing, and even i find this silly. I still call my son Master William. I like to believe he is a master of his own destiny. On 2021-03-17 11:20, Donald MacQueen via tz wrote: Agree. This is profoundly silly. On 3/17/2021 12:19 AM, Robert Elz via tz wrote: Date: Tue, 16 Mar 2021 18:41:05 -0700 From: Paul Eggert via tz <tz@iana.org><mailto:tz@iana.org> Message-ID: <4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu><mailto:4ed87012-2167-44a0-583c-c1122625ea0a@cs.ucla.edu> I have no problem with the change (don't use git anyway), but | Because the word "master" has negative connotations in English, No, it doesn't. The issue is more that no-one wants to work on any of the real issues, which are hard, but changing the words people use is (or can be) relatively easy, so it is attractive to do that, rather than anything hard, and one can claim to have made progress, when absolutely nothing that matters has changed. kre Donald [https://ipmcdn.avast.com/images/icons/icon-envelope-tick-round-orange-animated-no-repeat-v1.gif]<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient&utm_term=icon> Virus-free. www.avast.com<https://www.avast.com/sig-email?utm_medium=email&utm_source=link&utm_campaig...>
The git commands work great, but it leaves a `remotes/origin/HEAD` pointing to the (now-deleted) 'remotes/origin/master'. This triggers a warning if you try to do some housecleaning of the dangling `origin/master` using the `git remote prune origin` command. You need to run 2 more commands if you want a pristine local repo that's equivalent to doing a fresh 'git clone`: $ git remote set-head origin -a # automatically determine default, which will be `origin/main` $ git remote prune origin # remove `origin/master` from the local repo Personally, I'm not convinced that GitHub's push for this rename will make a meaningful difference for the underlying social problem, but this is not too much work either. Though I had to do it for 5 laptops, and this broke 3 of my continuous integration scripts... but nothing major. Brian On Tue, Mar 16, 2021 at 6:41 PM Paul Eggert via tz <tz@iana.org> wrote:
Because the word "master" has negative connotations in English, I renamed the "master" branch to "main" in the tzdb development repository <https://github.com/eggert/tz>. This follows in the wake of GitHub's October change that makes the default branch "main" rather than "master", and GitHub's followup changes in January that made renaming relatively painless - for example, web requests for "master" are now redirected to "main" automatically <https://github.com/github/renaming/>. This renaming by GitHub is part of a broader change within the Git software ecosystem <https://sfconservancy.org/news/2020/jun/23/gitbranchname/>.
This change affects neither past nor future releases of tzdb. It affects only the small number of direct accesses to the development repository for commits between releases. The idea is that on balance the small inconvenience for developers is outweighed by the advantage in reducing insensitivity overall.
If you are a developer with a local clone of the tzdb repository, please adjust to this change by running the following shell commands:
$ git branch -m master main $ git fetch origin $ git branch -u origin/main main
I've done this for my own local clone of the repository.
To document this change for tzdb newcomers, I installed the attached patch to the CONTRIBUTING file just before renaming the branch.
Brian Park via tz said:
Personally, I'm not convinced that GitHub's push for this rename will make a meaningful difference for the underlying social problem,
Nor am I. I have more sympathy for getting rid of "slave", particularly in the places where it's misused anyway, but I don't see that trying to pretend the practice never happened helps. Also, what happens to my masters degrees?
but this is not too much work either.
I had to manage over 5000 changes to a document. It wasn't just a search-and- replace because of all the places that "M" or "S" appeared in an acronym or initialism and we weren't allowed to use replacement terms with the same first letter *even* when they were innocuous and appropriate. (Thankfully someone else did most of the detailed work, though I had to review it all.) I'm wondering how many people will tell us we did a good job when the document is re-released and how many will complain that their source code now no longer matches the terminology, packet names, parameter names, and so on that they've been using for the last 20 years. -- Clive D.W. Feather | If you lie to the compiler, Email: clive@davros.org | it will get its revenge. Web: http://www.davros.org | - Henry Spencer Mobile: +44 7973 377646
participants (8)
-
Brian Park -
Clive D.W. Feather -
David Braverman -
David Patte -
Donald MacQueen -
Paul Eggert -
Robert Elz -
Steffen Nurpmeso