summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2019-05-30 11:46:11 -0700
committerShentubot <shentubot@google.com>2019-05-30 12:09:10 -0700
commite3c5fa3345139a38b380e14067640931ce885288 (patch)
tree952994a2af28f416d0cf2f24072d80a476f018fa
parentae26b2c425d53aa8720238183d1c156a45904311 (diff)
Update CONTRIBUTING.md
PiperOrigin-RevId: 250730726
-rw-r--r--.github/pull_request_template.md5
-rw-r--r--CONTRIBUTING.md47
2 files changed, 3 insertions, 49 deletions
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 0ac6c5ccb..000000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Thanks for contributing to gVisor!
-
-gVisor development happens on Gerrit rather than GitHub, so we don't accept pull requests here. Gerrit can be found here: https://gvisor-review.googlesource.com
-
-Please see the contributing guidelines for more information: https://github.com/google/gvisor/blob/master/CONTRIBUTING.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 390d10c09..149375896 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -81,47 +81,7 @@ Rules:
### Code reviews
-All changes must be submitted via [Gerrit][gerrit].
-
-All submissions, including submissions by project members, require review.
-
-To submit a patch, first clone the canonical repository.
-
-```
-git clone https://gvisor.googlesource.com/gvisor
-```
-
-From within the cloned directory, install the commit hooks (optional, but if you
-don't you will need to generate Change-Ids manually in your commits).
-
-```
-curl -Lo `git rev-parse --git-dir`/hooks/commit-msg https://gerrit-review.googlesource.com/tools/hooks/commit-msg
-chmod +x `git rev-parse --git-dir`/hooks/commit-msg
-```
-
-Edit the source and generate commits as you normally would. While making
-changes, remember to organize commits logically. Changes are not reviewed per
-branch (as with a pull request), they are reviewed per commit.
-
-Before posting a new patch, you will need to generate an appropriate
-authentication cookie. Visit the [repository][repo] and click the "Generate
-Password" link at the top of the page for instructions.
-
-To post a patch for review, push to a special "for" reference.
-
-```
-git push origin HEAD:refs/for/master
-```
-
-A change link will be generated for the commit, and a team member will review
-your change request, provide feedback (and submit when appropriate).
-
-If you receive an error like `No Contributor Agreement on file for user ...`,
-make sure you've [signed the CLA](#contributor-license-agreement).
-
-To address feedback, you may need to amend your commit and repush (don't change
-the Commit-Id in the commit message). This will generate a new version of the
-change.
+Code changes are accepted via [pull request][github].
When approved, the change will be submitted by a team member and automatically
merged into the repository.
@@ -129,7 +89,7 @@ merged into the repository.
### Bug IDs
Some TODOs and NOTEs sprinkled throughout the code have associated IDs of the
-form b/1234. These correspond to bugs in our internal bug tracker. Eventually
+form `b/1234`. These correspond to bugs in our internal bug tracker. Eventually
these bugs will be moved to the GitHub Issues, but until then they can simply be
ignored.
@@ -142,7 +102,6 @@ one above, the
[cppstyle]: https://google.github.io/styleguide/cppguide.html
[gcla]: https://cla.developers.google.com/about/google-individual
[gccla]: https://cla.developers.google.com/about/google-corporate
-[gerrit]: https://gvisor-review.googlesource.com
+[github]: https://github.com/google/gvisor/compare
[gostyle]: https://github.com/golang/go/wiki/CodeReviewComments
-[repo]: https://gvisor.googlesource.com/?format=HTML
[teststyle]: ./test/