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 [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 142AA385EC55 for ; Thu, 21 Jan 2021 13:31:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 142AA385EC55 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-0aNyF6n3PQ-qy_L13Q_uUw-1; Thu, 21 Jan 2021 08:31:00 -0500 X-MC-Unique: 0aNyF6n3PQ-qy_L13Q_uUw-1 Received: by mail-qv1-f70.google.com with SMTP id u8so1421144qvm.5 for ; Thu, 21 Jan 2021 05:31:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=RoJGtKwbhEptlv5RJsmTTc9B5bYHpHrlkN4NQP8WMCk=; b=f97Qtxqsk6ei9pq6QCanhSYdzPFcXG6geycdtR8bYtVhxPPyr5xN29kLHovPdszOxz T6GiaQewVgWkQ2CPbyO+aZeOcV3+JJzUL7LIlyiISK/U3LKAfvfL3o5f5yn2IiUagx2z KoOoPgTdLuz5JkL+N4+07SaHdJNWCUV1JHL2mWctj2VJTVpPo/4V2zATWBQPafNHJq3Z vZFtg0cIP38BnnwKAcB80PIMJlHKy59KyU+01MFDhKQIvVU8oE9fEOhtmzgEgVVRUcmc L7ixKpfa4plu71J/7P/yoEvZhqzZwTQrV8Q/B/StLjZG6UslGuFc2yqOdU5lFnY4IEYZ 7sxw== X-Gm-Message-State: AOAM531+lqLWsN1Er4Sw/pL8roCU1yIVtTOmyz0zTQ51gBtTHU7R4hVX VL8RnnhNzD6QZ8z1T5nNqDAWQdp6H2RAKO/MRxB4/mGVwRyEdOCo07VOThz6q6/yj2KenCR+vRc 1Z9EGUG3Pr5cYU67MvhMzg/8qgk2/9SRzpkd2IH52E6IS/xOW1aNUPLh2CI36DIaFco6c/Q== X-Received: by 2002:aed:3165:: with SMTP id 92mr13697784qtg.388.1611235859332; Thu, 21 Jan 2021 05:30:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwbiKRkBLk30SQVe9Geqap1UW9RYW6ldT1VsBA5xSUeuGlmlTP7S24lyxPvoFO0AITkf9cylg== X-Received: by 2002:aed:3165:: with SMTP id 92mr13697762qtg.388.1611235859036; Thu, 21 Jan 2021 05:30:59 -0800 (PST) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id p75sm359752qke.82.2021.01.21.05.30.57 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Jan 2021 05:30:57 -0800 (PST) Subject: Re: Rename "master" branch to "main"? To: Joseph Myers , libc-alpha References: <20210114092156.GK6938@vapier> <5727ea36-898b-6127-bcde-d6bfe2540c23@redhat.com> <20210114214223.GM6938@vapier> <3a4f5a34-3711-19ea-2b06-75b3a98c6246@redhat.com> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Thu, 21 Jan 2021 08:30:56 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-5.5 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_H4, RCVD_IN_MSPIKE_WL, 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: Thu, 21 Jan 2021 13:31:05 -0000 On 1/20/21 7:23 PM, Mike Frysinger wrote: > On 20 Jan 2021 08:49, Carlos O'Donell via Libc-alpha wrote: >> Having said that, I don't know how to do >> a redirect to keep old branches working (though I've seen it done in >> Fedora when we wholesale moved from /foo to /rpms/foo). > > what branches are you thinking of ? the old release branches ? tbh, i > think we should just look forward. lets focus on refs/heads/master -> > refs/heads/main. changing that branch requires updating hooks and such, > but no other branches should break. I am only thinking of master->main. Consensus was not to change any release branches. I would like the master->main transition be possible to do with a redirection so we don't break existing checkouts and scripts. I think that transition can be done with redirection because I saw something like this done in Fedora, but I haven't reviewed the solution. The problem of redirecting one branch, or all branches is effectively the same problem just solved once (and then solved later again if we want). > then for release branches, new ones will use main instead of master from > the very start. nothing will break as they're all new refs. people might > have to update their scripts to work with the new releases, but they have > to do that anyways to pull the upgrade. existing stuff won't break. My intent would be that with redirection nothing breaks. > so much like we aren't going to go through the git history and rewrite > all references to "master", leave the old branches alone as well. if > anything, it stands out as "there was a mistake and we rectified it". > as we generate new branches, they'll slowly age out of the default list > of active branches. Agreed. > if you really really want to rename those old branches, it can be done > after we clean up ToT and stop generating new bad branches ... let's > not hold back all progress because the long legacy tail is hard :). Agreed. -- Cheers, Carlos.