diff options
author | Mike Frysinger <vapier@google.com> | 2023-05-11 15:02:24 -0400 |
---|---|---|
committer | LUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-05-11 19:27:57 +0000 |
commit | acb9523eaab5a0aead71b85b5d17ac9b715b513c (patch) | |
tree | f671714d88a360ac214843e5c62b6805ef7c7df2 | |
parent | 041f97725a8b647b82fbeba971cb2caf84da68c7 (diff) | |
download | git-repo-acb9523eaab5a0aead71b85b5d17ac9b715b513c.tar.gz |
SUBMITTING_PATCHES: update with commit queue details
Change-Id: I59dffb8524cb95b3fd4196bcecd18426f09bf9c4
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/373694
Tested-by: Mike Frysinger <vapier@google.com>
Commit-Queue: Mike Frysinger <vapier@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
-rw-r--r-- | SUBMITTING_PATCHES.md | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/SUBMITTING_PATCHES.md b/SUBMITTING_PATCHES.md index df245a52..671a43fe 100644 --- a/SUBMITTING_PATCHES.md +++ b/SUBMITTING_PATCHES.md | |||
@@ -1,18 +1,19 @@ | |||
1 | [TOC] | 1 | # Submitting Changes |
2 | |||
3 | # Short Version | ||
4 | 2 | ||
5 | - Make small logical changes. | 3 | Here's a short overview of the process. |
6 | - [Provide a meaningful commit message][commit-message-style]. | ||
7 | - Make sure all code is under the Apache License, 2.0. | ||
8 | - Publish your changes for review. | ||
9 | - Make corrections if requested. | ||
10 | - Verify your changes on gerrit so they can be submitted. | ||
11 | 4 | ||
12 | `git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/main` | 5 | * Make small logical changes. |
6 | * [Provide a meaningful commit message][commit-message-style]. | ||
7 | * Make sure all code is under the Apache License, 2.0. | ||
8 | * Publish your changes for review. | ||
9 | * `git push origin HEAD:refs/for/main` | ||
10 | * Make corrections if requested. | ||
11 | * [Verify your changes on Gerrit.](#verify) | ||
12 | * [Send to the commit queue for testing & merging.](#cq) | ||
13 | 13 | ||
14 | [TOC] | ||
14 | 15 | ||
15 | # Long Version | 16 | ## Long Version |
16 | 17 | ||
17 | I wanted a file describing how to submit patches for repo, | 18 | I wanted a file describing how to submit patches for repo, |
18 | so I started with the one found in the core Git distribution | 19 | so I started with the one found in the core Git distribution |
@@ -174,12 +175,16 @@ commit. If you make the requested changes you will need to amend your commit | |||
174 | and push it to the review server again. | 175 | and push it to the review server again. |
175 | 176 | ||
176 | 177 | ||
177 | ## Verify your changes on gerrit | 178 | ## Verify your changes on Gerrit {#verify} |
178 | 179 | ||
179 | After you receive a Code-Review+2 from the maintainer, select the Verified | 180 | After you receive a Code-Review+2 from the maintainer, select the Verified |
180 | button on the gerrit page for the change. This verifies that you have tested | 181 | button on the Gerrit page for the change. This verifies that you have tested |
181 | your changes and notifies the maintainer that they are ready to be submitted. | 182 | your changes and notifies the maintainer that they are ready to be submitted. |
182 | The maintainer will then submit your changes to the repository. | ||
183 | 183 | ||
184 | ## Merge your changes via the commit queue {#cq} | ||
185 | |||
186 | Once a change is ready to be merged, select the Commit-Queue+2 setting on the | ||
187 | Gerrit page for it. This tells the CI system to test the change, and if it | ||
188 | passes all the checks, automatically merges it. | ||
184 | 189 | ||
185 | [commit-message-style]: https://chris.beams.io/posts/git-commit/ | 190 | [commit-message-style]: https://chris.beams.io/posts/git-commit/ |