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 6FFF63858036 for ; Thu, 21 Jan 2021 19:37:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6FFF63858036 Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-k8MQFBnkN9aNBWHFoA52KQ-1; Thu, 21 Jan 2021 14:37:33 -0500 X-MC-Unique: k8MQFBnkN9aNBWHFoA52KQ-1 Received: by mail-qk1-f197.google.com with SMTP id f27so2412840qkh.0 for ; Thu, 21 Jan 2021 11:37:33 -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=9nX5/6E6johJzPsEKATzrBYAfrYMsawocLEFMUaC+DI=; b=tLNYUyWOaWEqalfX+5My+FhCuHAJFMOvERSAR05GeVzpOXkgzg/jITTmIdzVYzmKKO U5q6Jtv6Swjwi+u8KLby3Bx/D3ftYQzu5hRi0me5vuyV+KnSCsbepEbykIzzekM8AlKH yscrWDR8w/y3gILx6OSrARPdNp2GLBh8HtR6tuSK8zEQEftnC4VCOD1rga87KFA0oKuV +EbKxNlGC3DX3DhiGFcSZY0mvUXqAYLJUVcV8r2UUQ51SwG0Pg3XysTgkS5ECf748cPI +lkwr0CqmHQUeJfcTkiOP7J5h0hIxUQFlIDxvNLK8GXJILaduZM73d343sGzEQqrFW+t BgoA== X-Gm-Message-State: AOAM530iqIuZWpbnw5om8FDqJNFi8JcTJzB3OOarcAnmHfHb1nZZQELd sivzb+a9p8RkOL5RZnOjiPkp/0K3Y1MAlbYv7gqqRkEa9Dg/SjJpulKTE2BPU7/EoAFDF9gw7bs CoDM/thSNC1cVK02NNxABGFbmQfgNukuWCeSteSMgnfwpmssxOMmYVZLr39jWuG1IGjfqMw== X-Received: by 2002:ac8:7767:: with SMTP id h7mr1226923qtu.136.1611257853155; Thu, 21 Jan 2021 11:37:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJx0csqrlcZUNH49cGEUdaOEaCBFU7A/sRaQEGJMuGN/70/S+DMDGOOlHKT0qRcQIE20ey9ASA== X-Received: by 2002:ac8:7767:: with SMTP id h7mr1226902qtu.136.1611257852871; Thu, 21 Jan 2021 11:37:32 -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 o67sm4227215qte.9.2021.01.21.11.37.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Jan 2021 11:37:31 -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: <7b395b7f-c0ed-1603-883b-d9599ccc4ce9@redhat.com> Date: Thu, 21 Jan 2021 14:37:30 -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 19:37:41 -0000 On 1/21/21 12:06 PM, Mike Frysinger wrote: > On 21 Jan 2021 08:30, Carlos O'Donell via Libc-alpha wrote: >> 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. > > i noted earlier that i was able to set up a redirect on my server: > $ cat refs/heads/master > ref: refs/heads/main > > setting up a redirect to ease people/scripts over to "main" sounds great, > but imo, we shouldn't leave it there forever. scripts will need to change. > if the point is to bury master, leaving it as a perm symlink defeats that. I think Fedora left the link there for a year. That's fine with me. We also announce it far and wide that it's changing. When the link was in place in Fedora git kept issuing an annoying message reminding you it was doing a redirect and that was useful to remind you to update your repo. >> 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). > > right, i just wanted to make sure we weren't going to stall waiting for a > complete solution for everything when we have a path for refs/heads/master. > > for the wiki page, doesn't seem like we've been great at organizing into > namespaces. we do have "GlibcGit" though, so maybe the page would be: > https://sourceware.org/glibc/wiki/GlibcGit/MigrationToMain Sure. > if that sounds fine, i can populate it with the content we've already > produced in these threads. obviously the real work is left to an admin > (i.e. you) as the rest of can only backseat drive ;). Having a checklist is *immensely* helpful. -- Cheers, Carlos.