summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-11-15 18:42:26 -0500
committerMike Frysinger <vapier@google.com>2020-11-16 05:07:33 +0000
commit6e89c965f40860f93389b919b4d7f190beb707f7 (patch)
treefa9d332ae2cdb27e6d46020a817dcdc5c349238f
parent1f20776dbb3b87ba39928dc4baba58f9c2d17c80 (diff)
downloadgit-repo-6e89c965f40860f93389b919b4d7f190beb707f7.tar.gz
switch to "main" branch for development
We're migrating from "master" to "main" as the default development branch. This only affects repo itself, not manifests. Change-Id: I27489dd721c9a467a1c43736808cb3b3c1365433 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/288082 Reviewed-by: Michael Mortensen <mmortensen@google.com> Tested-by: Mike Frysinger <vapier@google.com>
-rw-r--r--.github/workflows/test-ci.yml2
-rw-r--r--SUBMITTING_PATCHES.md4
-rw-r--r--docs/internal-fs-layout.md2
-rw-r--r--docs/manifest-format.md14
-rw-r--r--docs/python-support.md4
-rw-r--r--docs/release-process.md10
-rw-r--r--docs/repo-hooks.md2
7 files changed, 19 insertions, 19 deletions
diff --git a/.github/workflows/test-ci.yml b/.github/workflows/test-ci.yml
index ddc5a5f3..701b4fd2 100644
--- a/.github/workflows/test-ci.yml
+++ b/.github/workflows/test-ci.yml
@@ -5,7 +5,7 @@ name: Test CI
5 5
6on: 6on:
7 push: 7 push:
8 branches: [master, repo-1, stable, maint] 8 branches: [main, repo-1, stable, maint]
9 tags: [v*] 9 tags: [v*]
10 10
11jobs: 11jobs:
diff --git a/SUBMITTING_PATCHES.md b/SUBMITTING_PATCHES.md
index c51fac0b..0c189247 100644
--- a/SUBMITTING_PATCHES.md
+++ b/SUBMITTING_PATCHES.md
@@ -10,7 +10,7 @@
10 - Make corrections if requested. 10 - Make corrections if requested.
11 - Verify your changes on gerrit so they can be submitted. 11 - Verify your changes on gerrit so they can be submitted.
12 12
13 `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/master` 13 `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/main`
14 14
15 15
16# Long Version 16# Long Version
@@ -150,7 +150,7 @@ Push your patches over HTTPS to the review server, possibly through
150a remembered remote to make this easier in the future: 150a remembered remote to make this easier in the future:
151 151
152 git config remote.review.url https://gerrit-review.googlesource.com/git-repo 152 git config remote.review.url https://gerrit-review.googlesource.com/git-repo
153 git config remote.review.push HEAD:refs/for/master 153 git config remote.review.push HEAD:refs/for/main
154 154
155 git push review 155 git push review
156 156
diff --git a/docs/internal-fs-layout.md b/docs/internal-fs-layout.md
index 3537dfda..4d18bb31 100644
--- a/docs/internal-fs-layout.md
+++ b/docs/internal-fs-layout.md
@@ -106,7 +106,7 @@ support, see the [manifest-format.md] file.
106 setting in the manifest (i.e. the path on the remote server) with a `.git` 106 setting in the manifest (i.e. the path on the remote server) with a `.git`
107 suffix. This allows for multiple checkouts of the same remote git repo to 107 suffix. This allows for multiple checkouts of the same remote git repo to
108 share their objects. For example, you could have different branches of 108 share their objects. For example, you could have different branches of
109 `foo/bar.git` checked out to `foo/bar-master`, `foo/bar-release`, etc... 109 `foo/bar.git` checked out to `foo/bar-main`, `foo/bar-release`, etc...
110 There will be multiple trees under `projects/` for each one, but only one 110 There will be multiple trees under `projects/` for each one, but only one
111 under `project-objects/`. 111 under `project-objects/`.
112 112
diff --git a/docs/manifest-format.md b/docs/manifest-format.md
index 676e031d..b35a065f 100644
--- a/docs/manifest-format.md
+++ b/docs/manifest-format.md
@@ -142,8 +142,8 @@ Attribute `review`: Hostname of the Gerrit server where reviews
142are uploaded to by `repo upload`. This attribute is optional; 142are uploaded to by `repo upload`. This attribute is optional;
143if not specified then `repo upload` will not function. 143if not specified then `repo upload` will not function.
144 144
145Attribute `revision`: Name of a Git branch (e.g. `master` or 145Attribute `revision`: Name of a Git branch (e.g. `main` or
146`refs/heads/master`). Remotes with their own revision will override 146`refs/heads/main`). Remotes with their own revision will override
147the default revision. 147the default revision.
148 148
149### Element default 149### Element default
@@ -156,11 +156,11 @@ Attribute `remote`: Name of a previously defined remote element.
156Project elements lacking a remote attribute of their own will use 156Project elements lacking a remote attribute of their own will use
157this remote. 157this remote.
158 158
159Attribute `revision`: Name of a Git branch (e.g. `master` or 159Attribute `revision`: Name of a Git branch (e.g. `main` or
160`refs/heads/master`). Project elements lacking their own 160`refs/heads/main`). Project elements lacking their own
161revision attribute will use this revision. 161revision attribute will use this revision.
162 162
163Attribute `dest-branch`: Name of a Git branch (e.g. `master`). 163Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
164Project elements not setting their own `dest-branch` will inherit 164Project elements not setting their own `dest-branch` will inherit
165this value. If this value is not set, projects will use `revision` 165this value. If this value is not set, projects will use `revision`
166by default instead. 166by default instead.
@@ -247,13 +247,13 @@ If not supplied the remote given by the default element is used.
247 247
248Attribute `revision`: Name of the Git branch the manifest wants 248Attribute `revision`: Name of the Git branch the manifest wants
249to track for this project. Names can be relative to refs/heads 249to track for this project. Names can be relative to refs/heads
250(e.g. just "master") or absolute (e.g. "refs/heads/master"). 250(e.g. just "main") or absolute (e.g. "refs/heads/main").
251Tags and/or explicit SHA-1s should work in theory, but have not 251Tags and/or explicit SHA-1s should work in theory, but have not
252been extensively tested. If not supplied the revision given by 252been extensively tested. If not supplied the revision given by
253the remote element is used if applicable, else the default 253the remote element is used if applicable, else the default
254element is used. 254element is used.
255 255
256Attribute `dest-branch`: Name of a Git branch (e.g. `master`). 256Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
257When using `repo upload`, changes will be submitted for code 257When using `repo upload`, changes will be submitted for code
258review on this branch. If unspecified both here and in the 258review on this branch. If unspecified both here and in the
259default element, `revision` is used instead. 259default element, `revision` is used instead.
diff --git a/docs/python-support.md b/docs/python-support.md
index a5c490a8..3eaaba33 100644
--- a/docs/python-support.md
+++ b/docs/python-support.md
@@ -18,13 +18,13 @@ Bugfixes may be added on a best-effort basis or from the community, but largely
18no new features will be added, nor is support guaranteed. 18no new features will be added, nor is support guaranteed.
19 19
20Users can select this during `repo init` time via the [repo launcher]. 20Users can select this during `repo init` time via the [repo launcher].
21Otherwise the default branches (e.g. stable & master) will be used which will 21Otherwise the default branches (e.g. stable & main) will be used which will
22require Python 3. 22require Python 3.
23 23
24This means the [repo launcher] needs to support both Python 2 & Python 3, but 24This means the [repo launcher] needs to support both Python 2 & Python 3, but
25since it doesn't import any other repo code, this shouldn't be too problematic. 25since it doesn't import any other repo code, this shouldn't be too problematic.
26 26
27The master branch will require Python 3.6 at a minimum. 27The main branch will require Python 3.6 at a minimum.
28If the system has an older version of Python 3, then users will have to select 28If the system has an older version of Python 3, then users will have to select
29the legacy Python 2 branch instead. 29the legacy Python 2 branch instead.
30 30
diff --git a/docs/release-process.md b/docs/release-process.md
index 0df590ac..43209eb0 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -97,7 +97,7 @@ If that tag cannot be verified, it gives up and forces the user to resolve.
97 97
98## Branch management 98## Branch management
99 99
100All development happens on the `master` branch and should generally be stable. 100All development happens on the `main` branch and should generally be stable.
101 101
102Since the repo launcher defaults to tracking the `stable` branch, it is not 102Since the repo launcher defaults to tracking the `stable` branch, it is not
103normally updated until a new release is available. 103normally updated until a new release is available.
@@ -112,7 +112,7 @@ For example, when `stable` moves from `v1.10.x` to `v1.11.x`, then the `maint`
112branch will be updated from `v1.9.x` to `v1.10.x`. 112branch will be updated from `v1.9.x` to `v1.10.x`.
113 113
114We don't have parallel release branches/series. 114We don't have parallel release branches/series.
115Typically all tags are made against the `master` branch and then pushed to the 115Typically all tags are made against the `main` branch and then pushed to the
116`stable` branch to make it available to the rest of the world. 116`stable` branch to make it available to the rest of the world.
117Since repo doesn't typically see a lot of changes, this tends to be OK. 117Since repo doesn't typically see a lot of changes, this tends to be OK.
118 118
@@ -120,10 +120,10 @@ Since repo doesn't typically see a lot of changes, this tends to be OK.
120 120
121When you want to create a new release, you'll need to select a good version and 121When you want to create a new release, you'll need to select a good version and
122create a signed tag using a key registered in repo itself. 122create a signed tag using a key registered in repo itself.
123Typically we just tag the latest version of the `master` branch. 123Typically we just tag the latest version of the `main` branch.
124The tag could be pushed now, but it won't be used by clients normally (since the 124The tag could be pushed now, but it won't be used by clients normally (since the
125default `repo-rev` setting is `stable`). 125default `repo-rev` setting is `stable`).
126This would allow some early testing on systems who explicitly select `master`. 126This would allow some early testing on systems who explicitly select `main`.
127 127
128### Creating a signed tag 128### Creating a signed tag
129 129
@@ -144,7 +144,7 @@ $ export GNUPGHOME=~/.gnupg/repo/
144$ gpg -K 144$ gpg -K
145 145
146# Pick whatever branch or commit you want to tag. 146# Pick whatever branch or commit you want to tag.
147$ r=master 147$ r=main
148 148
149# Pick the new version. 149# Pick the new version.
150$ t=1.12.10 150$ t=1.12.10
diff --git a/docs/repo-hooks.md b/docs/repo-hooks.md
index 7c37c30e..cbb1aac7 100644
--- a/docs/repo-hooks.md
+++ b/docs/repo-hooks.md
@@ -27,7 +27,7 @@ repohooks project is updated and a hook is triggered.
27For the full syntax, see the [repo manifest format](./manifest-format.md). 27For the full syntax, see the [repo manifest format](./manifest-format.md).
28 28
29Here's a short example from 29Here's a short example from
30[Android](https://android.googlesource.com/platform/manifest/+/master/default.xml). 30[Android](https://android.googlesource.com/platform/manifest/+/HEAD/default.xml).
31The `<project>` line checks out the repohooks git repo to the local 31The `<project>` line checks out the repohooks git repo to the local
32`tools/repohooks/` path. The `<repo-hooks>` line says to look in the project 32`tools/repohooks/` path. The `<repo-hooks>` line says to look in the project
33with the name `platform/tools/repohooks` for hooks to run during the 33with the name `platform/tools/repohooks` for hooks to run during the