docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9083 from SvenDowideit/pr_out_remove_small_patch_exception_checking_in_hack_make_validate_dco 

Remove small patch exception checking in hack/make/validate-dco
This commit is contained in:
Jessie Frazelle 2014-12-16 16:25:17 -08:00
parent f538e4be6b 56e3f49d19
commit d06f496e4a
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CONTRIBUTING.md
View File

@ -272,18 +272,6 @@ Note that the old-style `Docker-DCO-1.1-Signed-off-by: ...` format is still
accepted, so there is no need to update outstanding pull requests to the new accepted, so there is no need to update outstanding pull requests to the new
format right away, but please do adjust your processes for future contributions. format right away, but please do adjust your processes for future contributions.
#### Small patch exception
There are several exceptions to the signing requirement. Currently these are:
* Your patch fixes spelling or grammar errors.
* Your patch is a single line change to documentation contained in the
`docs` directory.
* Your patch fixes Markdown formatting or syntax errors in the
documentation contained in the `docs` directory.
If you have any questions, please refer to the FAQ in the [docs](http://docs.docker.com)
### How can I become a maintainer? ### How can I become a maintainer?
* Step 1: Learn the component inside out * Step 1: Learn the component inside out

17
project/MAINTAINERS.md
View File

@ -121,6 +121,23 @@ request that comments out your `MAINTAINERS` file entry using a `#`.
Yes. Nobody should ever push to master directly. All changes should be Yes. Nobody should ever push to master directly. All changes should be
made through a pull request. made through a pull request.
### Helping contributors with the DCO
The [DCO or `Sign your work`](
https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work)
requirement is not intended as a roadblock or speed bump.
Some Docker contributors are not as familiar with `git`, or have used a web based
editor, and thus asking them to `git commit --amend -s` is not the best way forward.
In this case, maintainers can update the commits based on clause (c) of the DCO. The
most trivial way for a contributor to allow the maintainer to do this, is to add
a DCO signature in a Pull Requests's comment, or a maintainer can simply note that
the change is sufficiently trivial that it does not substantivly change the existing
contribution - i.e., a spelling change.
When you add someone's DCO, please also add your own to keep a log.
### Who assigns maintainers? ### Who assigns maintainers?
Solomon has final `LGTM` approval for all pull requests to `MAINTAINERS` files. Solomon has final `LGTM` approval for all pull requests to `MAINTAINERS` files.

4
project/make/validate-dco
View File

@ -4,7 +4,7 @@ source "$(dirname "$BASH_SOURCE")/.validate"
adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }') adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }')
dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }') dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }')
notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')" #notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
: ${adds:=0} : ${adds:=0}
: ${dels:=0} : ${dels:=0}
@ -22,8 +22,6 @@ check_dco() {
if [ $adds -eq 0 -a $dels -eq 0 ]; then if [ $adds -eq 0 -a $dels -eq 0 ]; then
echo '0 adds, 0 deletions; nothing to validate! :)' echo '0 adds, 0 deletions; nothing to validate! :)'
elif [ -z "$notDocs" -a $adds -le 1 -a $dels -le 1 ]; then
echo 'Congratulations! DCO small-patch-exception material!'
else else
commits=( $(validate_log --format='format:%H%n') ) commits=( $(validate_log --format='format:%H%n') )
badCommits=() badCommits=()