From e68d8fa768dc4a0ef9af5904d0e1bf02fce2ee18 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 1 Aug 2014 15:22:04 -0400 Subject: [PATCH] Accept vanilla Linux Foundation signoffs This allows signing off commits with `git commit -s` Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) Cleaned up DCO regex Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) Upstream-commit: 4909a702045e621f236f5ec5470c8a9ec7fd7022 Component: engine --- components/engine/contrib/prepare-commit-msg.hook | 10 ---------- components/engine/hack/make/validate-dco | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 components/engine/contrib/prepare-commit-msg.hook diff --git a/components/engine/contrib/prepare-commit-msg.hook b/components/engine/contrib/prepare-commit-msg.hook deleted file mode 100644 index c9389fb6d2..0000000000 --- a/components/engine/contrib/prepare-commit-msg.hook +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# Auto sign all commits to allow them to be used by the Docker project. -# see https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work -# -GH_USER=$(git config --get github.user) -SOB=$(git var GIT_AUTHOR_IDENT | sed -n "s/^\(.*>\).*$/Docker-DCO-1.1-Signed-off-by: \1 \(github: $GH_USER\)/p") -grep -qs "^$SOB" "$1" || { - echo - echo "$SOB" -} >> "$1" diff --git a/components/engine/hack/make/validate-dco b/components/engine/hack/make/validate-dco index 8f3bfc317a..1c75d91bfa 100644 --- a/components/engine/hack/make/validate-dco +++ b/components/engine/hack/make/validate-dco @@ -13,8 +13,8 @@ notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')" githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+' # https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work -dcoPrefix='Docker-DCO-1.1-Signed-off-by:' -dcoRegex="^$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)> \\(github: ($githubUsernameRegex)\\)$" +dcoPrefix='Signed-off-by:' +dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$" check_dco() { grep -qE "$dcoRegex"