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 97F463858D35 for ; Tue, 1 Feb 2022 03:02:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 97F463858D35 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-172-g2BWphkHPG-LOjzFonZojw-1; Mon, 31 Jan 2022 22:02:52 -0500 X-MC-Unique: g2BWphkHPG-LOjzFonZojw-1 Received: by mail-qv1-f71.google.com with SMTP id gg10-20020a056214252a00b0041eeb1c2684so14687662qvb.21 for ; Mon, 31 Jan 2022 19:02:52 -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:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=CthEDMuFDP5Qpn40qirCW2nCTnewT2PVboLHxW9KVqQ=; b=3klKXWojkLRYsONblDkKuZqiKuVf76+LXTTYjqfhjo4ttBkOsjOk3h/xf85FGGBrzI QNQ2ZtwJL3l+BbLm4wom47Xv7U+oLih/ZPAhZXBHF1203PNmrMIljs8KbdDFDksbpCw4 p/coCDhwMNv0+NJ3RkJFxd/j04U8h/X6keCiAc+wOMv1MqrCVgSc4g/3GPNJpap1hS/5 2A2MnH5bW2ZSN27+SvTc7P2MbqOGbsY/OSQCE3yfwltNQRq21t4fr15KnFAaK09ReYYq 7bBEmUcwu/mhU2WAw5amz+7XAnTRzs9tTOM4pO1Z3OMQ1zx5GjREG8vy9wxcYc98n9xs Qq2A== X-Gm-Message-State: AOAM533NQV0PXPnOB221awAw86g5qeya75+aIh7rA7GWvi07okbvNyiO IhvOxH29gviOej0v+VkpryPpnnL6Fm5YlDw+WiSJZzfdNjuyVCImS0dq+fZDMq11kvfsy6DPHdO Zs4plMWnsUuyYpaIrCo4f X-Received: by 2002:a05:620a:9c4:: with SMTP id y4mr15232408qky.2.1643684572173; Mon, 31 Jan 2022 19:02:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJygKTEw8dW04jWIKu45Jq6bWUESlAOQZiYmnBifRqjBD+a4QNQU5wKkq1n7VlSYw0bijDuB0w== X-Received: by 2002:a05:620a:9c4:: with SMTP id y4mr15232396qky.2.1643684571976; Mon, 31 Jan 2022 19:02:51 -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 z19sm7103271qtj.77.2022.01.31.19.02.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Jan 2022 19:02:51 -0800 (PST) Message-ID: Date: Mon, 31 Jan 2022 22:02:50 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: Rename "master" branch to "main" for glibc 2.35 release. To: Joseph Myers Cc: Florian Weimer , Jakub Jelinek , libc-alpha , Andreas Schwab , Maxim Kuvyrkov References: <77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com> From: Carlos O'Donell Organization: Red Hat In-Reply-To: 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, NICE_REPLY_A, 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: Tue, 01 Feb 2022 03:02:56 -0000 On 1/31/22 18:04, Joseph Myers wrote: > On Mon, 31 Jan 2022, Carlos O'Donell via Libc-alpha wrote: > >> Just for clarity then, if we do the work to support "main" and "master", >> and add an alias from "master" to "main" (git status would show as being >> on "main"), would that have your support? > > I'm fine with making the change if (a) we have an alias (created with "git > symbolic-ref", I suppose) to avoid breaking existing checkouts, at least > for reading and (b) the hook / hook configuration changes to handle "main" > the same as master are done before the "main" name is set up. I agree to that. > If the alias might end up getting removed, add (c) build-many-glibcs.py is > set up to transition its checkouts to the new name automatically, at least > a year in advance of the removal. Agreed. > An alias is not of course needed for release/2.35/main if no branch > release/2.35/master was ever created, but some of the hook changes *are* > needed to apply appropriate commit rules to release/2.35/main. Correct. -- Cheers, Carlos.