Merge branch '2348-rename-master' into 'master'

Rename default development branch to main Closes #2348 See merge request GNOME/glib!2140
2025-02-26 04:02:09 +01:00 · 2021-06-07 13:22:34 +00:00 · 2021-06-07 13:22:34 +00:00 · 6e92c2c233
commit 6e92c2c233
parent 8bb4e7519e d81165216d
23 changed files with 48 additions and 35 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -170,7 +170,7 @@ installed-tests:
    # FIXME install newer gobject-introspection
    # with GMemoryMonitor support, see:
    # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/193
-    - git clone --branch master --depth 1 --no-tags https://gitlab.gnome.org/GNOME/gobject-introspection.git
+    - git clone --single-branch --depth 1 --no-tags https://gitlab.gnome.org/GNOME/gobject-introspection.git
    - cd gobject-introspection
    - /usr/bin/meson _build --prefix=/usr --libdir=/usr/lib64
    - ninja -C _build
@ -513,7 +513,7 @@ coverity:
 pages:
  stage: deploy
  only:
-    - master
+    - main
  needs: ['coverage', 'style-check-diff']
  script:
    - mv _coverage/ public/
--- a/.gitlab-ci/meson-junit-report.py
+++ b/.gitlab-ci/meson-junit-report.py
@ -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",
--- a/.gitlab-ci/run-style-check-diff.sh
+++ b/.gitlab-ci/run-style-check-diff.sh
@ -25,7 +25,7 @@ exit_status=$?
 # style with the changes they’re making.)
 echo ""
 echo "Note that clang-format output is advisory and cannot always match the GLib coding style, documented at"
-echo "   https://gitlab.gnome.org/GNOME/gtk/blob/master/docs/CODING-STYLE"
+echo "   https://gitlab.gnome.org/GNOME/gtk/blob/HEAD/docs/CODING-STYLE.md"
 echo "Warnings from this tool can be ignored in favour of the documented coding style,"
 echo "or in favour of matching the style of existing surrounding code."

--- a/.gitlab-ci/search-common-ancestor.sh
+++ b/.gitlab-ci/search-common-ancestor.sh
@ -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
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -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
--- a/README.md
+++ b/README.md
@ -47,3 +47,16 @@ Closes: #123

 Otherwise, create a new merge request that introduces the change, filing a
 separate issue is not required.
+
+## Default branch renamed to `main`
+
+The default development branch of GLib has been renamed to `main`. To update
+your local checkout, use:
+```sh
+git checkout master
+git branch -m master main
+git fetch
+git branch --unset-upstream
+git branch -u origin/main
+git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
+```
--- a/SECURITY.md
+++ b/SECURITY.md
@ -63,5 +63,5 @@ additionally be made via
 ## Acknowledgements

 This text was partially based on the
-[github.com/containers security policy](https://github.com/containers/common/blob/master/SECURITY.md),
-and partially based on the [flatpak security policy](https://github.com/flatpak/flatpak/blob/master/SECURITY.md).
+[github.com/containers security policy](https://github.com/containers/common/blob/HEAD/SECURITY.md),
+and partially based on the [flatpak security policy](https://github.com/flatpak/flatpak/blob/HEAD/SECURITY.md).
--- a/fuzzing/README.md
+++ b/fuzzing/README.md
@ -40,7 +40,7 @@ $ DIR/fuzzing/fuzz_target_name FILE

 Correct MSAN instrumentation is [difficult to achieve](https://clang.llvm.org/docs/MemorySanitizer.html#handling-external-code) locally, so false positives are very likely to mask the actual bug.

-If need be, [you can still reproduce](https://github.com/google/oss-fuzz/blob/master/docs/reproducing.md#building-using-docker) those bugs with the oss-fuzz provided docker images.
+If need be, [you can still reproduce](https://google.github.io/oss-fuzz/advanced-topics/reproducing/#building-using-docker) those bugs with the oss-fuzz provided docker images.

 ###### There are no file/function names in the stack trace.

--- a/fuzzing/meson.build
+++ b/fuzzing/meson.build
@ -24,7 +24,7 @@ extra_sources = []
 extra_c_args = cc.get_supported_arguments('-Werror=unused-function')

 # Links in a static library provided by oss-fuzz, else a standalone driver.
-# https://github.com/google/oss-fuzz/blob/master/docs/new_project_guide.md#buildsh-script-environment
+# https://google.github.io/oss-fuzz/getting-started/new-project-guide/#buildsh-script-environment
 fuzzing_engine = cxx.find_library('FuzzingEngine', required : get_option('oss_fuzz'))
 if fuzzing_engine.found()
  deps += fuzzing_engine
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@ -155,13 +155,13 @@
 * respectively.
 *
 * For an example of opening files with a GApplication, see
- * [gapplication-example-open.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-open.c).
+ * [gapplication-example-open.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-open.c).
 *
 * For an example of using actions with GApplication, see
- * [gapplication-example-actions.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-actions.c).
+ * [gapplication-example-actions.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-actions.c).
 *
 * For an example of using extra D-Bus hooks with GApplication, see
- * [gapplication-example-dbushooks.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-dbushooks.c).
+ * [gapplication-example-dbushooks.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-dbushooks.c).
 */

 /**
@ -2399,7 +2399,7 @@ g_application_open (GApplication  *application,
 * and override local_command_line(). In this case, you most likely want
 * to return %TRUE from your local_command_line() implementation to
 * suppress the default handling. See
- * [gapplication-example-cmdline2.c][https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline2.c]
+ * [gapplication-example-cmdline2.c][https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline2.c]
 * for an example.
 *
 * If, after the above is done, the use count of the application is zero
--- a/gio/gapplicationcommandline.c
+++ b/gio/gapplicationcommandline.c
@ -104,7 +104,7 @@
 * }
 * ]|
 * The complete example can be found here: 
- * [gapplication-example-cmdline.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline.c)
+ * [gapplication-example-cmdline.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline.c)
 *
 * In more complicated cases, the handling of the comandline can be
 * split between the launcher and the primary instance.
@ -155,7 +155,7 @@
 * instance.
 *
 * The complete example can be found here:
- * [gapplication-example-cmdline2.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline2.c)
+ * [gapplication-example-cmdline2.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline2.c)
 *
 * If handling the commandline requires a lot of work, it may
 * be better to defer it.
@ -197,7 +197,7 @@
 * hold the application until you are done with the commandline.
 *
 * The complete example can be found here:
- * [gapplication-example-cmdline3.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gapplication-example-cmdline3.c)
+ * [gapplication-example-cmdline3.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gapplication-example-cmdline3.c)
 */

 /**
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@ -166,22 +166,22 @@
 * ## An example D-Bus server # {#gdbus-server}
 *
 * Here is an example for a D-Bus server:
- * [gdbus-example-server.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-server.c)
+ * [gdbus-example-server.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-server.c)
 *
 * ## An example for exporting a subtree # {#gdbus-subtree-server}
 *
 * Here is an example for exporting a subtree:
- * [gdbus-example-subtree.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-subtree.c)
+ * [gdbus-example-subtree.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-subtree.c)
 *
 * ## An example for file descriptor passing # {#gdbus-unix-fd-client}
 *
 * Here is an example for passing UNIX file descriptors:
- * [gdbus-unix-fd-client.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-unix-fd-client.c)
+ * [gdbus-unix-fd-client.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-unix-fd-client.c)
 *
 * ## An example for exporting a GObject # {#gdbus-export}
 *
 * Here is an example for exporting a #GObject:
- * [gdbus-example-export.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-export.c)
+ * [gdbus-example-export.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-export.c)
 */

 /* ---------------------------------------------------------------------------------------------------- */
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@ -39,7 +39,7 @@
 * Convenience API for owning bus names.
 *
 * A simple example for owning a name can be found in
- * [gdbus-example-own-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-own-name.c)
+ * [gdbus-example-own-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-own-name.c)
 */

 G_LOCK_DEFINE_STATIC (lock);
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@ -40,7 +40,7 @@
 * Convenience API for watching bus names.
 *
 * A simple example for watching a name can be found in
- * [gdbus-example-watch-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-watch-name.c)
+ * [gdbus-example-watch-name.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-watch-name.c)
 */

 G_LOCK_DEFINE_STATIC (lock);
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@ -92,7 +92,7 @@
 * of the thread where the instance was constructed.
 *
 * An example using a proxy for a well-known name can be found in
- * [gdbus-example-watch-proxy.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-watch-proxy.c)
+ * [gdbus-example-watch-proxy.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-watch-proxy.c)
 */

 /* lock protecting the mutable properties: name_owner, timeout_msec,
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@ -77,7 +77,7 @@
 * session or system bus, you should instead use g_bus_own_name().
 *
 * An example of peer-to-peer communication with GDBus can be found
- * in [gdbus-example-peer.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-example-peer.c).
+ * in [gdbus-example-peer.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-example-peer.c).
 *
 * Note that a minimal #GDBusServer will accept connections from any
 * peer. In many use-cases it will be necessary to add a #GDBusAuthObserver
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@ -121,7 +121,7 @@
 * utility. The input is a schema description in an XML format.
 *
 * A DTD for the gschema XML format can be found here:
- * [gschema.dtd](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/gschema.dtd)
+ * [gschema.dtd](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/gschema.dtd)
 *
 * The [glib-compile-schemas][glib-compile-schemas] tool expects schema
 * files to have the extension `.gschema.xml`.
--- a/gio/gtestdbus.c
+++ b/gio/gtestdbus.c
@ -380,7 +380,7 @@ _g_test_watcher_remove_pid (GPid pid)
 *
 * An example of a test fixture for D-Bus services can be found
 * here:
- * [gdbus-test-fixture.c](https://gitlab.gnome.org/GNOME/glib/-/blob/master/gio/tests/gdbus-test-fixture.c)
+ * [gdbus-test-fixture.c](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/gio/tests/gdbus-test-fixture.c)
 *
 * Note that these examples only deal with isolating the D-Bus aspect of your
 * service. To successfully run isolated unit tests on your service you may need
--- a/glib.doap
+++ b/glib.doap
@ -56,7 +56,7 @@

  <repository>
    <GitRepository>
-      <browse rdf:resource="https://gitlab.gnome.org/GNOME/glib/tree/master"/>
+      <browse rdf:resource="https://gitlab.gnome.org/GNOME/glib/"/>
      <location rdf:resource="https://gitlab.gnome.org/GNOME/glib.git"/>
    </GitRepository>
  </repository>
--- a/glib.supp
+++ b/glib.supp
@ -700,7 +700,7 @@
 	fun:g_inet_address_get_type
 }

-# From: https://github.com/fredericgermain/valgrind/blob/master/glibc-2.X-drd.supp
+# From: https://github.com/fredericgermain/valgrind/blob/HEAD/glibc-2.X-drd.supp
 {
 	drd-libc-stdio
 	drd:ConflictingAccess
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@ -80,7 +80,7 @@
 * displaying the bookmark inside a GUI.
 *
 * Here is an example of a bookmark file:
- * [bookmarks.xbel](https://gitlab.gnome.org/GNOME/glib/-/blob/master/glib/tests/bookmarks.xbel)
+ * [bookmarks.xbel](https://gitlab.gnome.org/GNOME/glib/-/blob/HEAD/glib/tests/bookmarks.xbel)
 *
 * A bookmark file might contain more than one bookmark; each bookmark
 * is accessed through its URI.
--- a/gmodule/gmodule-dl.c
+++ b/gmodule/gmodule-dl.c
@ -81,7 +81,7 @@
 *
 * However, some libc implementations, such as glibc, implement dlerror() using
 * thread-local storage, so are thread-safe. As of early 2021:
- *  - glibc is thread-safe: https://github.com/bminor/glibc/blob/master/dlfcn/libc_dlerror_result.c
+ *  - glibc is thread-safe: https://github.com/bminor/glibc/blob/HEAD/dlfcn/libc_dlerror_result.c
 *  - uclibc-ng is not thread-safe: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/tree/ldso/libdl/libdl.c?id=132decd2a043d0ccf799f42bf89f3ae0c11e95d5#n1075
 *  - Other libc implementations have not been checked, and no problems have
 *    been reported with them in 10 years, so default to assuming that they
--- a/subprojects/gtk-doc.wrap
+++ b/subprojects/gtk-doc.wrap
@ -1,5 +1,5 @@
 [wrap-git]
 directory=gtk-doc
 url=https://gitlab.gnome.org/GNOME/gtk-doc.git
-revision=master
+revision=1.33.2
 depth=1