From 4efca856c040ce78b08534a41190ae6c63326e04 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 26 Mar 2022 19:41:55 +0200 Subject: utils: hooks: pre-push: Catch commits without author's SoB The pre-push git hook script catches commits without a SoB line corresponding to the committer, but doesn't perform the same check on the author. Fix it. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- utils/hooks/pre-push | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/hooks/pre-push b/utils/hooks/pre-push index e4187f38..90ffdf6f 100755 --- a/utils/hooks/pre-push +++ b/utils/hooks/pre-push @@ -67,8 +67,8 @@ do errors=$((errors+1)) fi - # 2. The commit message shall have a Signed-off-by line - # corresponding the committer. + # 2. The commit message shall have Signed-off-by lines + # corresponding the committer and the author. 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}" @@ -77,6 +77,14 @@ do errors=$((errors+1)) fi + author=$(echo "$msg" | grep '^author ' | head -1 | \ + cut -d ' ' -f 2- | rev | cut -d ' ' -f 3- | rev) + if ! echo "$msg" | grep -F -q "Signed-off-by: ${author}" + then + echo >&2 "Missing author Signed-off-by in commit $commit" + errors=$((errors+1)) + fi + # 3. A Reviewed-by or Acked-by is required. if ! echo "$msg" | grep -q '^\(Reviewed\|Acked\)-by: ' then -- cgit v1.2.1