From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 3AC913861922 for ; Mon, 13 Jul 2020 15:14:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3AC913861922 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-362-ehlzIXH-OYyBwTECUDRh9Q-1; Mon, 13 Jul 2020 11:14:45 -0400 X-MC-Unique: ehlzIXH-OYyBwTECUDRh9Q-1 Received: by mail-qt1-f200.google.com with SMTP id i5so10363826qtw.3 for ; Mon, 13 Jul 2020 08:14:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=cqv6jDjVjUoPqwsKAkkXXoKVDcp2vglUvxNoTnyDQVE=; b=ZWWw9IfuXuHBLarbmfLla352W3f0oo9YelO2aa/3DzK7pdFCJtX+Qr1MWlqBWqnURT 5nlyUbGn8ifdW7ehJUrxevVoCf7X98AwRundFrFM1EKAO9kZ+wpBs1mjaVLtVvhEMnHB oL4ZxYKXx6Nf+ObqmGFfdNb1t7dCpgbkLc7gwZ9V8E59TboSGPgD4brrgIJdybkc4nNO Dfh4rN1dOGRTI3uX5/E7wNC6+KN1CFaCWpMl+/QM7tU72YVWjMOVvMRnWqAS5RoCoPN0 EwFyzlSF45xF1HK93tZY+DsytTj+5ppu0V0hAuDAq4tPW30yftfwE4/maN8W3OcUBP9N 3V3Q== X-Gm-Message-State: AOAM532iPBLesFJZR4eCsU49PBjbRYO4F9zsO8Sy2fZaciLafntvsR8N WZZjf1Ec3EugdgJ9M+GfOgEittwMkak5VCpuc0jy5K77fIl6H6E139ZwYubfmERhQueSKVPAeWi CxjwYwv02FgF2qP4ida87 X-Received: by 2002:ac8:5411:: with SMTP id b17mr6149766qtq.238.1594653284708; Mon, 13 Jul 2020 08:14:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydZ8zmutd/zWAgBoBNhyeO8q6WD5WUdXEWQhZM6Rmcx2yY/p7bzh5s2Czz5ALhrHuxWvIHpA== X-Received: by 2002:ac8:5411:: with SMTP id b17mr6149750qtq.238.1594653284483; Mon, 13 Jul 2020 08:14:44 -0700 (PDT) Received: from [192.168.1.4] (198-84-170-103.cpe.teksavvy.com. [198.84.170.103]) by smtp.gmail.com with ESMTPSA id f65sm19450460qtd.61.2020.07.13.08.14.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 13 Jul 2020 08:14:43 -0700 (PDT) Subject: Re: Rename "master" branch to "main"? From: Carlos O'Donell To: libc-alpha References: Organization: Red Hat Message-ID: <41c4f0ae-5d30-e854-e138-3a31772f15f5@redhat.com> Date: Mon, 13 Jul 2020 11:14:42 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham 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: Mon, 13 Jul 2020 15:14:56 -0000 On 6/30/20 2:10 PM, Carlos O'Donell wrote: > Community, > > 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 > > This proposal is only about the development branch and upcoming release > branch. Please start a new thread to discuss the historical branch names > or other relevant issues. > > My concern is that git, as a project, has not yet changed their default, > and it would be beneficial to match their default name. I am OK with > waiting for the git project to make a choice before changing our branch > name to match. The Linux kernel has adopted the following guidance: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb -- Cheers, Carlos.