mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 22:46:15 +01:00
Rename the master branch to main
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:
parent
1a43d950b4
commit
24e459e3d8
@ -513,7 +513,7 @@ coverity:
|
||||
pages:
|
||||
stage: deploy
|
||||
only:
|
||||
- master
|
||||
- main
|
||||
needs: ['coverage', 'style-check-diff']
|
||||
script:
|
||||
- mv _coverage/ public/
|
||||
|
@ -27,7 +27,7 @@ aparser.add_argument(
|
||||
"--branch",
|
||||
metavar="NAME",
|
||||
help="Branch of the project being tested",
|
||||
default="master",
|
||||
default="main",
|
||||
)
|
||||
aparser.add_argument(
|
||||
"--output",
|
||||
|
@ -9,7 +9,7 @@ ancestor_horizon=28 # days (4 weeks)
|
||||
# branches.
|
||||
#
|
||||
# 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.
|
||||
if ! git ls-remote --exit-code upstream >/dev/null 2>&1 ; then
|
||||
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
|
||||
# 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}`
|
||||
# are only defined if we’re running in a merge request pipeline,
|
||||
# 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)
|
||||
if [ -z "${newest_common_ancestor_sha}" ]; then
|
||||
echo "Couldn’t find common ancestor with upstream master. This typically"
|
||||
echo "happens if you branched from master a long time ago. Please update"
|
||||
echo "Couldn’t find common ancestor with upstream main branch. This typically"
|
||||
echo "happens if you branched from main a long time ago. Please update"
|
||||
echo "your clone, rebase, and re-push your branch."
|
||||
exit 1
|
||||
fi
|
||||
|
@ -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
|
||||
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
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user