From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mailbackend.panix.com (mailbackend.panix.com [166.84.1.89]) by sourceware.org (Postfix) with ESMTPS id 808773858D34 for ; Thu, 2 Jul 2020 15:40:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 808773858D34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=panix.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=zackw@panix.com Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by mailbackend.panix.com (Postfix) with ESMTPSA id 49yMkg0qpvzthw for ; Thu, 2 Jul 2020 11:40:59 -0400 (EDT) Received: by mail-ej1-f47.google.com with SMTP id y10so30268170eje.1 for ; Thu, 02 Jul 2020 08:40:59 -0700 (PDT) X-Gm-Message-State: AOAM533dAhRILpSeyWdMJRsmj987N6SaN8gS3RWo4VLH2isUeP+nBIbY EEZGeQeWFlwJjGX35s8e+xdv+3U6wWrm2JzAP6c= X-Google-Smtp-Source: ABdhPJzHJKqj/UeROlmfMWiiA6qk8WWPALrPGnGqxcUFupZ0+j8lOLi8C8t6W15zo5MJQwHH1j0sfeEVXAjMk2MOSgE= X-Received: by 2002:a17:906:2c53:: with SMTP id f19mr26257218ejh.523.1593704458105; Thu, 02 Jul 2020 08:40:58 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Zack Weinberg Date: Thu, 2 Jul 2020 11:40:47 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Rename "master" branch to "main"? To: "Carlos O'Donell" Cc: libc-alpha Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 15:41:00 -0000 On Tue, Jun 30, 2020 at 2:10 PM Carlos O'Donell via Libc-alpha wrote: > As we approach the release boundary for 2.32 we come to a natural point > where we can rename our development and release branch. > > Red Hat CTO Chris Wright wrote about this recently: > https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language > > LWN also wrote about this recently in "Loaded terms in free software": > https://lwn.net/Articles/823224/ > > Github is committed to changing the default development branch to "main": > https://twitter.com/natfriedman/status/1271253144442253312 > > There are open requests for Gitlab to adopt "main" as the default branch name: > https://gitlab.com/gitlab-org/gitlab/-/issues/220906 > https://gitlab.com/gitlab-org/gitlab/-/issues/222204 > > My proposal would be to rename the development and current release branch: > > * master -> main > > * release/2.32/master -> release/2.32/main I think this is an appropriate change for us to make, and that the existing requests for other organizations to make this or a similar change are sufficient evidence for us to do so as well. We do not need to know that someone who might contribute to *this project* was put off by the name "master"; we do know that people have been put off by Git's use of that name, in other contexts, enough to speak up in those contexts. Changing it before we are specifically asked shows that we are paying attention to these issues as they arise in the larger community. That said I think this is not as important as other, similar, changes we could make. For instance, the term "master" is used _along with_ "slave" in manual/terminal.texi, and I fully intend to rewrite that chapter to eliminate that terminology as soon as I find the time. Anyone want to beat me to it? zw