luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename the master branch to main

Browse Source 
It’s a more inclusive name, has the same tab-completion prefix, and is
the default choice for new repositories created locally by git, and on
GitHub and GitLab.

https://sfconservancy.org/news/2020/jun/23/gitbranchname/

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Fixes: #2348
This commit is contained in:
Philip Withnall
2021-06-07 13:18:19 +01:00
parent 1a43d950b4
commit 24e459e3d8
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -513,7 +513,7 @@ coverity:
pages: pages:
stage: deploy stage: deploy
only: only:
- master - main
needs: ['coverage', 'style-check-diff'] needs: ['coverage', 'style-check-diff']
script: script:
- mv _coverage/ public/ - mv _coverage/ public/

2
.gitlab-ci/meson-junit-report.py
View File

@@ -27,7 +27,7 @@ aparser.add_argument(
"--branch", "--branch",
metavar="NAME", metavar="NAME",
help="Branch of the project being tested", help="Branch of the project being tested",
default="master", default="main",
) )
aparser.add_argument( aparser.add_argument(
"--output", "--output",

8
.gitlab-ci/search-common-ancestor.sh
View File

@@ -9,7 +9,7 @@ ancestor_horizon=28 # days (4 weeks)
# branches. # branches.
# #
# Limit the fetch to a certain date horizon to limit the amount of data we get. # Limit the fetch to a certain date horizon to limit the amount of data we get.
# If the branch was forked from origin/master before this horizon, it should # If the branch was forked from origin/main before this horizon, it should
# probably be rebased. # probably be rebased.
if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then
git remote add upstream https://gitlab.gnome.org/GNOME/glib.git git remote add upstream https://gitlab.gnome.org/GNOME/glib.git
@@ -18,7 +18,7 @@ git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%
# Work out the newest common ancestor between the detached HEAD that this CI job # Work out the newest common ancestor between the detached HEAD that this CI job
# has checked out, and the upstream target branch (which will typically be # has checked out, and the upstream target branch (which will typically be
# `upstream/master` or `upstream/glib-2-62`). # `upstream/main` or `upstream/glib-2-62`).
# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}` # `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` or `${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}`
# are only defined if we’re running in a merge request pipeline, # are only defined if we’re running in a merge request pipeline,
# fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively # fall back to `${CI_DEFAULT_BRANCH}` or `${CI_COMMIT_BRANCH}` respectively
@@ -29,8 +29,8 @@ git fetch --shallow-since="$(date --date="${ancestor_horizon} days ago" +%Y-%m-%
newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent "origin/${source_branch}") | head -1) newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent "upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}") <(git rev-list --first-parent "origin/${source_branch}") | head -1)
if [ -z "${newest_common_ancestor_sha}" ]; then if [ -z "${newest_common_ancestor_sha}" ]; then
echo "Couldn’t find common ancestor with upstream master. This typically" echo "Couldn’t find common ancestor with upstream main branch. This typically"
echo "happens if you branched from master a long time ago. Please update" echo "happens if you branched from main a long time ago. Please update"
echo "your clone, rebase, and re-push your branch." echo "your clone, rebase, and re-push your branch."
exit 1 exit 1
fi fi

2
CONTRIBUTING.md
View File

@@ -256,7 +256,7 @@ to avoid unnecessary breakage, and to take advantage of the knowledge about GLib
that has been built up over the years, we’d like to ask people contributing to that has been built up over the years, we’d like to ask people contributing to
GLib to follow a few rules: GLib to follow a few rules:
0. Never push to the `master` branch, or any stable branches, directly; you 0. Never push to the `main` branch, or any stable branches, directly; you
should always go through a merge request, to ensure that the code is should always go through a merge request, to ensure that the code is
tested on the CI infrastructure at the very least. A merge request is tested on the CI infrastructure at the very least. A merge request is
also the proper place to get a comprehensive code review from the core also the proper place to get a comprehensive code review from the core