public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Carlos O'Donell <carlos@redhat.com>
To: libc-alpha <libc-alpha@sourceware.org>,
	Andreas Schwab <schwab@suse.de>,
	Joseph Myers <joseph@codesourcery.com>,
	Paul Eggert <eggert@cs.ucla.edu>,
	Florian Weimer <fweimer@redhat.com>, DJ Delorie <dj@redhat.com>,
	"Ryan S. Arnold" <ryan.arnold@gmail.com>,
	Jakub Jelinek <jakub@redhat.com>,
	Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Subject: Rename "master" branch to "main" for glibc 2.35 release.
Date: Sat, 29 Jan 2022 17:32:33 -0500	[thread overview]
Message-ID: <77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com> (raw)

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 <name>\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 <name>\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.


             reply	other threads:[~2022-01-29 22:32 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-29 22:32 Carlos O'Donell [this message]
2022-01-29 22:45 ` Phil Blundell
2022-01-29 23:33 ` DJ Delorie
2022-01-30  1:35   ` Mike Frysinger
2022-01-30  2:10     ` DJ Delorie
2022-01-30  3:45       ` Mike Frysinger
2022-01-30  2:35 ` Paul Eggert
2022-01-30  5:41   ` Siddhesh Poyarekar
2022-01-31 12:46 ` Florian Weimer
2022-01-31 13:41   ` Andreas Schwab
2022-01-31 14:55   ` Carlos O'Donell
2022-02-01  0:59     ` Dmitry V. Levin
2022-02-01  3:05       ` Carlos O'Donell
2022-01-31 12:50 ` Tulio Magno Quites Machado Filho
2022-01-31 16:19 ` Joseph Myers
2022-01-31 17:59   ` Dan Raymond
2022-01-31 18:04     ` Dan Raymond
2022-01-31 22:49   ` Carlos O'Donell
2022-01-31 23:04     ` Joseph Myers
2022-02-01  3:02       ` Carlos O'Donell
2022-01-31 18:09 ` Adhemerval Zanella
2022-01-31 18:14   ` H.J. Lu
2022-01-31 18:21     ` Adhemerval Zanella
2022-01-31 18:28   ` DJ Delorie
2022-02-01  3:08     ` Siddhesh Poyarekar
2022-02-01  3:44       ` DJ Delorie
2022-02-01  5:05         ` Siddhesh Poyarekar
2022-02-01  7:25           ` Carlos O'Donell
2022-01-31 20:15   ` Siddhesh Poyarekar
2022-01-31 21:24     ` Adhemerval Zanella
2022-02-01  2:51       ` Siddhesh Poyarekar
2022-02-01  9:49     ` Florian Weimer
2022-02-01 10:26       ` Siddhesh Poyarekar
2022-02-03  5:57 ` Carlos O'Donell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=77c04408-2508-350e-2f8e-db070e8d35f6@redhat.com \
    --to=carlos@redhat.com \
    --cc=dj@redhat.com \
    --cc=eggert@cs.ucla.edu \
    --cc=fweimer@redhat.com \
    --cc=jakub@redhat.com \
    --cc=joseph@codesourcery.com \
    --cc=libc-alpha@sourceware.org \
    --cc=maxim.kuvyrkov@linaro.org \
    --cc=ryan.arnold@gmail.com \
    --cc=schwab@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).