This allows signing off commits with `git commit -s`
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Cleaned up DCO regex
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
| 1 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,10 +0,0 @@ |
| 1 |
-#!/bin/sh |
|
| 2 |
-# Auto sign all commits to allow them to be used by the Docker project. |
|
| 3 |
-# see https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work |
|
| 4 |
-# |
|
| 5 |
-GH_USER=$(git config --get github.user) |
|
| 6 |
-SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p") |
|
| 7 |
-grep -qs "^$SOB" "$1" || {
|
|
| 8 |
- echo |
|
| 9 |
- echo "$SOB" |
|
| 10 |
-} >> "$1" |
| ... | ... |
@@ -13,8 +13,8 @@ notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
|
| 13 | 13 |
githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+' |
| 14 | 14 |
|
| 15 | 15 |
# https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work |
| 16 |
-dcoPrefix='Docker-DCO-1.1-Signed-off-by:' |
|
| 17 |
-dcoRegex="^$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)> \\(github: ($githubUsernameRegex)\\)$" |
|
| 16 |
+dcoPrefix='Signed-off-by:' |
|
| 17 |
+dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$" |
|
| 18 | 18 |
|
| 19 | 19 |
check_dco() {
|
| 20 | 20 |
grep -qE "$dcoRegex" |