From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id 232053858D37 for ; Tue, 30 Jun 2020 21:44:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 232053858D37 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-239-kqLqN4YBOsSC1whDmxzqSw-1; Tue, 30 Jun 2020 17:44:04 -0400 X-MC-Unique: kqLqN4YBOsSC1whDmxzqSw-1 Received: by mail-qv1-f70.google.com with SMTP id g17so12976934qvw.0 for ; Tue, 30 Jun 2020 14:44:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=O0BDizez1yZoFLxJ3MlMNSBxtdUEk5VvJcM+XawSsCk=; b=k3ZtmLaoeCDD0THiX82/okBabYWpfcM04O+oO2uwjimL4XRv2J3GekROcePapN0nkP W5djelDwc1brfoGSJyvhDSd1ALbM+zooOyxSQFIFD3w7hqk0Nfz9Oz5lYsgtckP8Prn8 3vx4iwbsv9Fb2pLt+We6qyOqeVYRcczXbKQ4PqeYa8u8CYD16JpAVmluv5RR/DmX5uyR hfR91aLpu72L0sVlEt82aaXIGWK1u+LieeQy5pfHJLuDxNfD/F0iH3YDHpImZ9rU6SK+ tDz/UKx/qeCjXoknkNwafvY8sphJumJSIwYOMzv5nAt/6zx53dN6fyMqE9S5MA97jdZW 87Jw== X-Gm-Message-State: AOAM532+JElZgaCGTeyiqTkWtdJd0U1sxDpZIT5g+oW0r4eIHEQLz0Ef y6SWZ7bqJMmPqwRx1LBxyreAyaeWb1erCQBaesH3LyPAzegz7jo5ex7Kvi3WQoscVpC3zF0MDv0 gQmtGmSuSnhH+w6tfPvwx X-Received: by 2002:ac8:7a98:: with SMTP id x24mr23368523qtr.368.1593553443565; Tue, 30 Jun 2020 14:44:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSwKjjV2gcnwJyKW5s1M9kohB+9LukwxMDoZ3qE8LaBj6eVOWAq/gdyCnL6urN1E/Q1abRCw== X-Received: by 2002:ac8:7a98:: with SMTP id x24mr23368500qtr.368.1593553443276; Tue, 30 Jun 2020 14:44:03 -0700 (PDT) Received: from [192.168.1.4] (198-84-170-103.cpe.teksavvy.com. [198.84.170.103]) by smtp.gmail.com with ESMTPSA id j198sm4038993qke.71.2020.06.30.14.44.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Jun 2020 14:44:02 -0700 (PDT) Subject: Re: Rename "master" branch to "main"? To: Joseph Myers Cc: libc-alpha References: From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Tue, 30 Jun 2020 17:44:01 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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: Tue, 30 Jun 2020 21:44:07 -0000 On 6/30/20 5:24 PM, Joseph Myers wrote: > On Tue, 30 Jun 2020, Carlos O'Donell via Libc-alpha wrote: > >> My proposal would be to rename the development and current release branch: >> >> * master -> main >> >> * release/2.32/master -> release/2.32/main > > Have you reviewed the git hooks and hook configuration to identify > anything that special-cases master or branch names involving "master"? > For example, configuration of which branches do or do not allow > non-fast-forward pushes / merge commits / ...? I have access to and can review all of that code. Florian and I set it all up on sourceware. I see only 1 reference in the hooks to "master" and it's for computing a short name for email subjects that eschews the branch name (updates/branches/update.py). The rest is driven entirely by direct references to what is being committed. We will have to update the configuration of the hooks once the branch is renamed. > Do you have all the wiki updates that would be required prepared? In > particular, detailed instructions for updating existing clones that have > branches tracking master? No, we would need to update GlibcGit with new information. Also providing instructions to update existing clones would be needed and we need to work that out, but since many people are working this out it should be a straight forward process. -- Cheers, Carlos.