From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id 222D1385417F for ; Fri, 13 Jan 2023 14:20:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 222D1385417F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.com Received: from [192.168.15.119] ([88.97.26.74]) by mail.gmx.net (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MEFzr-1pPvp52xLp-00ABcM for ; Fri, 13 Jan 2023 15:20:30 +0100 Message-ID: <32aca832-3e93-d988-7636-7d4853512610@gmx.com> Date: Fri, 13 Jan 2023 14:20:30 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: newlib-cygwin.git repository: Switching "master" to "main" To: cygwin@cygwin.com References: Content-Language: en-GB From: Sam Edge In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:OxC1r4qjUu1ZgUOraV8mdpwtUWQfBdAay22oKW1SKodwS+4NKFw ZEHGHfyM6oAgPOfgzGOkL0ueTtf8xeGd+18ylKAWc9JiepJtzmxKrCeCit5imgl+9L0nfJ/ 3pMchEpbUwtxVsMr9MOAh7KEVZlLbMSzaf87icGjw6PG/ywgA737e2ku5yhAptQ9A6b82Vr /2EsWwYweAQvp5O9TOhKg== UI-OutboundReport: notjunk:1;M01:P0:NIS3hhOpcZY=;6ODKrUnj4R3pvuZmGJlFzAI6TRI yzY3JgeGnsarcFJumKnIzrrefCFT6Ku1br3W1XxSLgAh+kzmdXN1XhQFuMx3Itpr+SC7Ikre7 ZT2/JK0wsGRckgfjNRzcusVd5VrRIRE9F6VaTcuHmUj1SnFULEHUojWrCwJE98R7ZMOQyX5WG YJUABL/AKSrbisQVFjtQxpQSxnSGGC85w/+WE/SCschA1q3WaAgze0LMC0UUD2wloVmaWWc1J KVLKGUWXIvfqqLFSyrnASrU3MwPNuky3xyb4agKp7EhPGtgyLXRcNIIueGDCVXk+D2Azv+vTI OkPpsB+xf3QF4v68CpEe5VCqjVuH4y3Er6xT1FtH7//zoa3RH/LK6EKYC/tik/jb9eQtQc4v2 gU7rmo1ayOUi1XVWFRv/JDL43DAVfp1e5IihjDmAY0DUSvdRFipjrET5Y8VC1o9hN7kh+BE4p XYRNSy4zzUP5LRGxnzWi5kSayA0nQ7m4PrODFOEriGd8c7TJ5oC4orj6z+V/FaUjW05wMFX0u EGKyY8OS5V8LTpVrBn8HGNiBCjw6cUaSTPGZ68SBRfAr6CLw+VcxmCdyqCYOU+qmGBWLiEgLx E1nlqF6SfEF+ck2XQt+6LZrDUd0yjB65stlvNf89VjGhfjOxhK+O/Z5O+tltrlzzcuGIDotjB Ir32CDqCdGt33Qoyil96c87KvWl5omN9/Wj9DWppl4zh4evDYj+ZXK+MQkulCASCQ7bP6t0BC dT23hT+Gd74O9yz4AlIZjr5fpGYxTmSip3VRfXYgzypheOYCniPurMUWtPd8y84CAse/O6EBk 2RbXSSexPCFfOT4vFSO7lh9mabuV94XCKdtf0psFXJPEGVKsPfuGtUM5yiKyHAgAqYfjTWbMu MoXWZa+BEbwVtmzu7wYlsxIZGx2hN/EiTEmP53ZTFlwQcCYzKcfmEbogM4Bt71xC6fnGaAGr/ GaiDRCmW9mTZR+jLNu5OCQkRXYc= X-Spam-Status: No, score=-3.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM,KAM_DMARC_STATUS,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 13/01/2023 11:55, Corinna Vinschen via Cygwin wrote: > Hey folks, > > In the light of recent discussions, and following other projects already > having done this step, we changed the name of the "master" branch in > the newlib-cygwin.git upstream repository to "main". > > If you fetched from upstream in the last two days, you might already > have noticed that an "origin/main" branch suddenly showed up, but your > "master" branch still worked as before. > > The reason is that we also added a symbolic reference upstream, so that > "origin/master" points to "origin/main".  Both "branches" are now > constantly kept in sync upstream. > > Therefore, you can continue your work on "master" without disruption, > if you prefer to do so. > > However, on the client side, the "master" and "main" branches are > treated as two distinct branches.  If you work on your local "main" > clone and commit a patch, it's not keeping your local "master" branch in > sync.  After pushing your change upstream, though, the upstream idea of > "main" and "master" is, again, the same.  After fetching from upstream, > the patch will show up in both tracking branches, "origin/main" as well > as "origin/master", so pulling on both local branches will show the same > tree. > > Having said that.  Ideally you only use one of the branches locally > to avoid any confusion: > > - If you prefer to work in "master", just continue to do so and don't >   create a local "main" branch tracking "origin/main". > > - If you prefer to work in "main", checkout "origin/main" as "main" and >   delete your local "master" branch. > > > Have fun, > Corinna > > While I can understand sensitivity over the word 'slave' this is taking things too far in my opinion. I just conducted a quick poll of my Afro-Caribbean & other non-Caucasian workmates who all express the same sentiment. There is only one use case that relates to slavery. There are dozens that do not. Are we supposed to stop using all of them? The git usage is not to do with master/slave relationship anyway. See https://www.merriam-webster.com/dictionary/master, for example:- * "In Casablanca, I am the master of my own fate." * "She is a master carpenter." * "He is a master of the violin." * "The professor is the master of the college." * "The maid has a master key to all the hotel rooms." People are enduring slavery all over the world right now - here in the UK & USA as well as elsewhere. Not using the words does not stop it happening. Well, it's a fait accompli on the Cygwin repos. -- Sam Edge