From 093a9fa360174773332fd9825394d927d9c6363b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 18 Feb 2025 14:31:28 +0000 Subject: [PATCH] Rename the git branch used for development to 'main' This follows the convention used by many projects and hosting platforms. Signed-off-by: Simon McVittie (cherry picked from commit 067036036379cf8425b782fff983aec7190d8182) --- .gitlab-ci.yml | 2 +- CONTRIBUTING.md | 6 +++--- NEWS | 2 +- maint/release-checklist.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f24c143..a267ed2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ variables: ### WINDOWS_TAG: "2023-05-12.0" - UPSTREAM_BRANCH: 'master' + UPSTREAM_BRANCH: 'main' UPSTREAM_REPO: 'dbus/dbus' WINDOWS_AMD64_SUFFIX: 'amd64/windows' WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$UPSTREAM_BRANCH" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c092d0a..7155d49a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,12 +73,12 @@ branch in future. Stable branches are named after the version number itself (`dbus-1.2`, `dbus-1.4`), whereas the development branch is simply known as -`master`. +`main`. New features, enhancements, minor bug fixes, and bug fixes that are -unusually intrusive should always be based on the `master` branch. +unusually intrusive should always be based on the `main` branch. -Fixes for significant bugs should be developed on the `master` branch +Fixes for significant bugs should be developed on the `main` branch and cherry-picked to the most recent stable branch. Depending on the release cycles of various Linux distributions, some diff --git a/NEWS b/NEWS index 9ddce0c6..95ad6e53 100644 --- a/NEWS +++ b/NEWS @@ -176,7 +176,7 @@ Build-time configuration changes: It is incomplete and not ready for production use, and has been compile-time-disabled and impossible to enable without patching since 1.13.20. To reduce confusion, delete the code completely. - It remains present on the git `master` branch for 1.17.x, and will + It remains present on the git `main` branch for 1.17.x, and will hopefully be reinstated during the 1.17.x cycle. (dbus!488, dbus!490; Simon McVittie) diff --git a/maint/release-checklist.md b/maint/release-checklist.md index fe0c6183..181d0180 100644 --- a/maint/release-checklist.md +++ b/maint/release-checklist.md @@ -46,7 +46,7 @@ To make a release of D-Bus, do the following: dbus-specification.xml and set the release date to "(not finalized)". - push your changes and the tag to the central repository with - `git push origin master dbus-X.Y dbus-X.Y.Z` + `git push --atomic origin main dbus-X.Y dbus-X.Y.Z` - scp your tarball to freedesktop.org server and copy it to `dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus/`. @@ -72,7 +72,7 @@ Because we won't make minor changes like keeping up with the latest deprecations on a stable branch, stable branches should turn off the gcc warning for deprecated declarations (e.g. see commit 76a68867). -Be extra-careful not to merge master (or any branch based on master) into a +Be extra-careful not to merge main (or any branch based on main) into a stable branch. To branch: