Merge pull request #2815 from travier/rename

*: rename master branch to main

.cci.jenkinsfile

@@ -19,7 +19,7 @@ codestyle: {
       checkout scm
       shwrap("""
         # Ensures that we get refs to aid `git describe`
-        git fetch origin +refs/heads/master:refs/remotes/origin/master
+        git fetch origin +refs/heads/main:refs/remotes/origin/main
         ci/commit-validation.sh
       """)
   }

.github/workflows/rust-lints.yml

@@ -2,9 +2,9 @@
 name: Rust
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 env:
   CARGO_TERM_COLOR: always

README.md

@@ -44,4 +44,4 @@ For more information, see the [project documentation](docs/index.md) or the
 ## License
 
 rpm-ostree includes code licensed under GPLv2+, LGPLv2+, (Apache 2.0 OR MIT).
-For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/master/LICENSE).
+For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/main/LICENSE).

ci/ci-commitmessage-submodules.sh

@@ -39,7 +39,7 @@ gitdir=$(realpath $(pwd))
 # require a newer git, we could use `git worktree`.
 cp -a ${gitdir} ${tmpd}/workdir
 cd ${tmpd}/workdir
-git log --pretty=oneline origin/master..$HEAD | while read logline; do
+git log --pretty=oneline origin/main..$HEAD | while read logline; do
     commit=$(echo ${logline} | cut -f 1 -d ' ')
     # For merge commits, just check that they're empty (i.e. no conflict
     # resolution was needed). Otherwise, let's just error out. Conflicts should

docs/CONTRIBUTING.md

@@ -24,5 +24,5 @@ There is `make check` as well as `make vmcheck`. See also what the
 See the [OSTree CONTRIBUTING][contributing] coding style.
 
 [rpm-ostree]: https://github.com/coreos/rpm-ostree
-[jenkinsfile]: https://github.com/coreos/rpm-ostree/blob/master/.cci.jenkinsfile
+[jenkinsfile]: https://github.com/coreos/rpm-ostree/blob/main/.cci.jenkinsfile
 [contributing]: https://github.com/ostreedev/ostree/blob/master/docs/CONTRIBUTING.md

docs/HACKING.md

@@ -110,7 +110,7 @@ So just do e.g.:
 ```
 cd libdnf
 git fetch origin
-git reset --hard origin/master
+git reset --hard origin/main
 cd ..
 ```
 
@@ -119,7 +119,7 @@ The various `make` targets will pick up the changes and recompile.
 ## Testing with a custom ostree
 
 It is sometimes necessary to develop against a version of ostree which is not
-even yet in git master. In such situations, one can simply do:
+even yet in git main. In such situations, one can simply do:
 
 ```sh
 $ # from the rpm-ostree build dir

docs/RELEASE.md

@@ -9,8 +9,8 @@ nav_order: 8
 3. Verify the libdnf deps in `rpm-ostree.spec.in` are up to date by comparing to
    the spec of the bundled version (`libdnf/libdnf.spec`).
 4. Submit as a PR and wait until reviewed *and* CI is green.
-5. Once merged, do `git pull $upstream && git reset --hard $upstream/master` on
+5. Once merged, do `git pull $upstream && git reset --hard $upstream/main` on
-   your local `master` branch to make sure you're on the right commit.
+   your local `main` branch to make sure you're on the right commit.
 6. Draft release notes by seeding a HackMD.io with `git shortlog $last_tag..`
    and ideally collaborating with others. Filter out the commits from
    `dependabot`. See previous releases for format.

docs/_config.yml

@@ -28,7 +28,7 @@ last_edit_time_format: "%b %e %Y at %I:%M %p"
 gh_edit_link: true
 gh_edit_link_text: "Edit this page on GitHub"
 gh_edit_repository: "https://github.com/coreos/rpm-ostree"
-gh_edit_branch: "master"
+gh_edit_branch: "main"
 gh_edit_source: docs
 gh_edit_view_mode: "tree"
 

docs/architecture-daemon.md

@@ -35,17 +35,17 @@ reason for this architecture is primarily:
 3. to allow unprivileged users to make system mutations via polkit
 
 The D-Bus API is defined here:
-https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.xml
+https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.xml
 
 The rpm-ostree daemon runs as a systemd service which owns the
 `org.projectatomic.rpmostree1` name on the system D-Bus:
 
-https://github.com/coreos/rpm-ostree/blob/master/src/daemon/rpm-ostreed.service.in
+https://github.com/coreos/rpm-ostree/blob/main/src/daemon/rpm-ostreed.service.in
 
 When a client wants to talk to the daemon, the D-Bus daemon starts up the
 systemd service if it's not already running:
 
-https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.service.in
+https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.service.in
 
 ### Interacting with the daemon
 
@@ -100,7 +100,7 @@ actions.
 
 We ship a base policy file which provide actions which should be allowed:
 
-https://github.com/coreos/rpm-ostree/blob/master/src/daemon/org.projectatomic.rpmostree1.policy
+https://github.com/coreos/rpm-ostree/blob/main/src/daemon/org.projectatomic.rpmostree1.policy
 
 Some distros may enhance this policy by shipping rules which dynamically
 calculate authorization based on e.g. group membership. For example, in

docs/index.md

@@ -188,4 +188,4 @@ rpm-ostree specific talks:
 ## License
 
 rpm-ostree includes code licensed under GPLv2+, LGPLv2+, (Apache 2.0 OR MIT).
-For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/master/LICENSE).
+For more information, see [LICENSE](https://github.com/coreos/rpm-ostree/blob/main/LICENSE).

docs/repo_structure.md

@@ -52,7 +52,7 @@ nav_order: 9
 
 ## Makefiles
 
-These files are used when doing raw build instructions. You can find more info [here](https://github.com/projectatomic/rpm-ostree/blob/master/HACKING.md#raw-build-instructions):
+These files are used when doing raw build instructions. You can find more info [here](https://github.com/projectatomic/rpm-ostree/blob/main/HACKING.md#raw-build-instructions):
 
 ```
 .

packaging/rpm-ostree.spec.in

@@ -1,5 +1,5 @@
 # The canonical copy of this spec file is upstream at:
-# https://github.com/coreos/rpm-ostree/blob/master/packaging/rpm-ostree.spec.in
+# https://github.com/coreos/rpm-ostree/blob/main/packaging/rpm-ostree.spec.in
 
 Summary: Hybrid image/package system
 Name: rpm-ostree

tests/vmcheck/install.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 
 # This is just a small wrapper for `make install`, but with the added logic to
 # pull in ostree packages from the build container. We always assume development
-# and testing is against git master ostree and that the build container is
+# and testing is against git main ostree and that the build container is
 # tracking e.g. CAHC or FAHC (see HACKING.md for more details).
 
 DESTDIR=${topsrcdir}/insttree