From fcfbec801bab520bcbb246f38f8efc448c901946 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 27 Apr 2020 01:22:01 +0300 Subject: utils: hooks: pre-push: Catch commits without committer's SoB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Improve the pre-push git hook script to reject commits without the committer's Signed-off-by line. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- utils/hooks/pre-push | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'utils/hooks') diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push index 34906dde..0eb8f5ce 100755 --- a/utils/hooks/pre-push +++ b/utils/hooks/pre-push @@ -32,12 +32,35 @@ do range="$remote_sha..$local_sha" fi + # # Find invalid commits. - commit=$(git rev-list -n 1 --grep '^---' "$range") - if [ -n "$commit" ] + # + errors=0 + for commit in $(git rev-list "$range") + do + msg=$(git cat-file commit "$commit") + + # 1. The commit message shall not contain a local changelog. + if echo "$msg" | grep -q '^--- *$' + then + echo >&2 "Found local changelog in commit $commit" + errors=$((errors+1)) + fi + + # 2. The commit message shall have a Signed-off-by line + # corresponding the committer. + committer=$(echo "$msg" | grep '^committer ' | head -1 | \ + cut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev) + if ! echo "$msg" | grep -F -q "Signed-off-by: ${committer}" + then + echo >&2 "Missing committer Signed-off-by in commit $commit" + errors=$((errors+1)) + fi + done + + if [ $errors != 0 ] then - echo >&2 "Found local changelog in $local_ref, not pushing" - echo >&2 "Check commit $commit" + echo >&2 "Found $errors errors in $local_ref, not pushing" exit 1 fi done -- cgit v1.2.1