From 94956267f3820b70c39fce9d4d3cf7020c32d4a2 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 9 Sep 2016 21:02:46 -0700 Subject: [PATCH 1/2] doc: update onboarding PR landing info Clarify a few items in the onboarding doc about landing a PR. One addition is to include the optionsl `Refs:` metadata. --- doc/onboarding.md | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/onboarding.md b/doc/onboarding.md index 2effe6051e9925..2af6090a508bfe 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -170,18 +170,24 @@ Landing a PR * `git rebase -i upstream/master` * squash into logical commits if necessary * `./configure && make -j8 test` (`-j8` builds node in parallel with 8 threads. adjust to the number of cores (or processor-level threads) your processor has (or slightly more) for best results.) -* Amend the commit description - * commits should follow `subsystem[,subsystem]: small description\n\nbig description\n\n` - * first line 50 columns, all others 72 - * add metadata: - * `Fixes: ` - * `Reviewed-By: human ` - * Easiest to use `git log` then do a search - * (`/Name` + `enter` (+ `n` as much as you need to) in vim) - * Only include collaborators who have commented `LGTM` +* Amend the commit description. + * Commits should be of the form `subsystem[,subsystem]: small description\n\nbig description\n\n` + * The first line should not exceed 50 characters. + * The remaining lines (except for metadata lines) should wrap at 72 characters. + * Add required metadata: * `PR-URL: ` + * `Reviewed-By: human ` + * Easiest to use `git log`, then do a search. + * In vim: `/Name` + `enter` (+ `n` as much as you need to) + * Only include collaborators who have commented `LGTM`. + * Add additional metadata as appropriate: + * `Fixes: ` + * URL of GitHub issue that the PR fixes. + * This will automatically close the PR when the commit lands in master. + * `Refs: ` + * URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it. * `git push upstream master` - * close the original PR with "Landed in ``". + * Close the pull request with a "Landed in ``" comment. ## exercise: make PRs adding yourselves to the README From efa0bf0e0107f05d134ea10417254ef31501f43f Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 10 Sep 2016 08:41:12 -0700 Subject: [PATCH 2/2] squash: address nits --- doc/onboarding.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/onboarding.md b/doc/onboarding.md index 2af6090a508bfe..e1c1a5dca4baf6 100644 --- a/doc/onboarding.md +++ b/doc/onboarding.md @@ -176,16 +176,16 @@ Landing a PR * The remaining lines (except for metadata lines) should wrap at 72 characters. * Add required metadata: * `PR-URL: ` - * `Reviewed-By: human ` + * `Reviewed-By: ` * Easiest to use `git log`, then do a search. * In vim: `/Name` + `enter` (+ `n` as much as you need to) * Only include collaborators who have commented `LGTM`. * Add additional metadata as appropriate: * `Fixes: ` - * URL of GitHub issue that the PR fixes. + * Full URL of GitHub issue that the PR fixes. * This will automatically close the PR when the commit lands in master. * `Refs: ` - * URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it. + * Full URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it. * `git push upstream master` * Close the pull request with a "Landed in ``" comment.