From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0DF4C3858D28 for ; Sat, 29 Jan 2022 22:32:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0DF4C3858D28 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-536-TL6BCuMyNJmhTp4MoLhVgw-1; Sat, 29 Jan 2022 17:32:36 -0500 X-MC-Unique: TL6BCuMyNJmhTp4MoLhVgw-1 Received: by mail-qk1-f200.google.com with SMTP id p20-20020a05620a22b400b0047ecab0db4fso7272242qkh.2 for ; Sat, 29 Jan 2022 14:32:36 -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 :content-language:to:from:subject:organization :content-transfer-encoding; bh=3OWYtmhxkHgL2Wav1NOwm149gN944AgfwP+f3r9z4lY=; b=MC9Atan7TNefr6C6RZkWIy2mnKM+hD6h00EDekJ5uW1ISo5Bc0YqbX5ZgTI4xmsE2M D2ShnArnc0zTLKfAPmmxvNMMKwAzPjKzH5uKiD75ynQVGTCuAT5CdSNpWXXFC2jlGrSF h0N3BorMTS+2oZg0+2PdD4g8bkaCO71bXqR5JlcgK5OQPasVRO1aMTxCs+F4sT0+U5e4 TLho7ndXpfSvCk1J8zWf8q4ep0D7ik8UkxqOrgmto3Q+ap35a/o7CFTmoCveGgRTrQec +x/OHv3zd4tznAU+ZSxwCWdRJSuSyVJbwgnZ+49rtPgLH1n2uWeZf8vThflZeCnTPY54 WAYA== X-Gm-Message-State: AOAM531qVSbLkb2UhOE6ILP4CycS6UnDoQrKMMwkftb2XIXIJSPmBmTf jrBlSdXRLlLU6kWAk8AWlTEc2SF6r84YTpSpkOLB7y0cKDu/KAQ6HpLOXGgCNW5xFeFr3uZAAgz kWTs4WmMD6yshbo6l9W6+lvRPLS5YMl/BzQDPLdBoX9Q/tvZdnWSqNUaHMm1je4IewMf5Vw== X-Received: by 2002:ad4:5dc6:: with SMTP id m6mr12633359qvh.87.1643495555864; Sat, 29 Jan 2022 14:32:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgmSiqqNYQIDsq29M2B/V/3gpcy/BALxLrmzR+f4qpntMJ9k9JbHWAQCVTD8Go1x2dVm0UYA== X-Received: by 2002:ad4:5dc6:: with SMTP id m6mr12633340qvh.87.1643495555539; Sat, 29 Jan 2022 14:32:35 -0800 (PST) Received: from [192.168.0.241] (135-23-175-80.cpe.pppoe.ca. [135.23.175.80]) by smtp.gmail.com with ESMTPSA id v22sm4038413qtc.96.2022.01.29.14.32.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 29 Jan 2022 14:32:34 -0800 (PST) Message-ID: <77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com> Date: Sat, 29 Jan 2022 17:32:33 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 To: libc-alpha , Andreas Schwab , Joseph Myers , Paul Eggert , Florian Weimer , DJ Delorie , "Ryan S. Arnold" , Jakub Jelinek , Maxim Kuvyrkov From: Carlos O'Donell Subject: Rename "master" branch to "main" for glibc 2.35 release. Organization: Red Hat X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_MANYTO, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, 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: Sat, 29 Jan 2022 22:32:41 -0000 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. -- Cheers, Carlos.