From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by sourceware.org (Postfix) with ESMTPS id 38D223857815 for ; Mon, 31 Jan 2022 18:09:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 38D223857815 Received: by mail-oi1-x230.google.com with SMTP id q8so13751275oiw.7 for ; Mon, 31 Jan 2022 10:09:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=QrrkMl+GwFrjQ9HO4A4Ztq84Ckl+TuzkHW1b9x+HNZg=; b=Q8LgX2B17YlFS3HDwMLJBQYVxEyvNW4+ihqOEvEgQxY3u2rPVUicvQ9N2GQAHzOQGG zJlJ144ORd8SKymHFFlswisR+QVOb2oDraTzGj5bir0Y9Coume5pI7nMTyEJzV2sXTN6 ZQlCOth+Bnp8dcGXlbx7u7PGhY8ChElpLcy9QvtBEFQ08iNlrCG8Qf8TSOL4Mf2qNuzG 0qAKPmArzr7YSqdLXlrA1YgQq5qokSDeaIjjVXZk5ISMUtSQdkrcN5o8pAmrpwsw4vif zKV4A9urstsEFzhIy1Gg8JXNoEJWhQYFdEIjneTr2h5+zsAzIs7FIErM/mKu98KQt90t +DTQ== X-Gm-Message-State: AOAM533hkK3yyUCtiE1nSbhn+B1jXOl0PJ7+Xu2cmOGUg7KYmC3oGwYt 5b6OEVjRlMuKVg9aWR+Nk/FmZg== X-Google-Smtp-Source: ABdhPJygyj7G5A0bkzo0tMPDxGwVGwL75w/kGP5x0DjrOUZrlU+uBd3aUouWP+oOlLIYwhnrrXniRQ== X-Received: by 2002:a05:6808:21a5:: with SMTP id be37mr13198926oib.339.1643652563516; Mon, 31 Jan 2022 10:09:23 -0800 (PST) Received: from ?IPV6:2804:431:c7ca:709a:6c4d:e6a3:641:9e99? ([2804:431:c7ca:709a:6c4d:e6a3:641:9e99]) by smtp.gmail.com with ESMTPSA id bg34sm2238221oob.14.2022.01.31.10.09.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Jan 2022 10:09:23 -0800 (PST) Message-ID: Date: Mon, 31 Jan 2022 15:09:19 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: Rename "master" branch to "main" for glibc 2.35 release. Content-Language: en-US To: Carlos O'Donell , libc-alpha , Andreas Schwab , Joseph Myers , Paul Eggert , Florian Weimer , DJ Delorie , "Ryan S. Arnold" , Jakub Jelinek , Maxim Kuvyrkov References: <77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com> From: Adhemerval Zanella In-Reply-To: <77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_MANYTO, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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, 31 Jan 2022 18:09:26 -0000 On 29/01/2022 19:32, Carlos O'Donell via Libc-alpha wrote: > In June 2020 I started this thread for glibc 2.32: > https://sourceware.org/pipermail/libc-alpha/2020-June/115579.html > to discuss a branch name change. > > Thanks to Paul, Florian, Joseph and DJ who provided feedback on > the initial discussion. > > As of today the default Gitlab new branch is "main" (Gitlab 14 or later). > > As of today the default Github new branch is "main". > > With Git 2.28+ the default branch name is configurable. > > Git has added this advisory text: > ~~~ > 562 static const char default_branch_name_advice[] = N_( > 563 "Using '%s' as the name for the initial branch. This default branch name\n" > 564 "is subject to change. To configure the initial branch name to use in all\n" > 565 "of your new repositories, which will suppress this warning, call:\n" > 566 "\n" > 567 "\tgit config --global init.defaultBranch \n" > 568 "\n" > 569 "Names commonly chosen instead of 'master' are 'main', 'trunk' and\n" > 570 "'development'. The just-created branch can be renamed via this command:\n" > 571 "\n" > 572 "\tgit branch -m \n" > ~~~ > > My proposal is to rename the development and release branches at the point > that glibc 2.35 branches: > > * master -> main > > * release/2.35/master -> release/2.35/main > > No alias would be provided for the master branch; we would immediately > start using 'main' as the development branch. > > I am looking for consensus on this proposal. > > Details: > ======== > > Given the feedback from the last proposal I have done the required > review to ensure the transition can happen smoothly within our own > infrastructure. > > This proposal is only about the development branch and upcoming release > branch. All historical branches remain at their existing names. > > I have reviewed the git hooks, and we would need to make changes to the > following files after the transition: > * hooks-bin/email-to-bugzilla-filtered > * hooks-bin/post-receive > > Our hooks implementation (AdaCore's hooks) is neutral on the branch name > used. There are two instances where 'master' is removed for '' to > shorten an email message because it's the "default", but that should not > be a blocker for our transition. > > There are changes required to our project.config in refs/meta/config: > * reject-merge-commits for 'main' needs to be set. > * allow-non-fast-forward must be adjusted for 'main'. > > Wiki pages that need changing immediately: > * https://sourceware.org/glibc/wiki/GlibcGit > > How to update a renamed upstream branch: > # Rename old branch to new branch. > $ git branch -m OLD-BRANCH-NAME NEW-BRANCH-NAME > # Fetch upstream origin to get new branch name. > $ git fetch origin > # Set upstream to thew new renamed branch. > $ git branch -u origin/NEW-BRANCH-NAME NEW-BRANCH-NAME > # Set the default branch for origin automatically > $ git remote set-head origin -a > # Prune the old references away. > $ git remote prune origin > > Website needs updating immediately: > * https://www.gnu.org/software/libc/sources.html > * https://www.gnu.org/software/libc/started.html > > All other wiki, web, and source references can be adjusted over time. > I must say that I am failing to see any technical advantage or improvement of doing this change.