Skip to content

Only check DCO on the author's commits #16388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 7 commits into from
Jun 3, 2021
Merged

Only check DCO on the author's commits #16388

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c75575
Add a white-list file for ignoring the dco verify on specific commit
soulxu May 7, 2021
e029d21
Fix double quote
soulxu May 8, 2021
308828c
Move the DCO check from pre-push hook to commit-msg hook
soulxu May 10, 2021
f095c23
add newline at eof
soulxu May 11, 2021
bccf79a
remove the allow list file
soulxu May 11, 2021
320d87a
Only check the DCO on the author's commits
soulxu May 18, 2021
33a25bc
Remove useless change
soulxu May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dco_verify_white_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58da8ae48f274c3c602fe03eb7675b09d23340af
11 changes: 10 additions & 1 deletion support/hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,22 @@ do
RANGE="$REMOTE_SHA..$LOCAL_SHA"
fi

# Provide a white-list to ignore the DCO verify on specific commits
DCO_WHITE_LIST_PATH="$(dirname "$(realpath "$0")")/../../dco_verify_white_list.txt"
DCO_WHITE_LIST=""
if [ -f "$DCO_WHITE_LIST_PATH" ]
then
WHITE_LIST="$(cat "$DCO_WHITE_LIST_PATH")"
fi

# Verify DCO signoff. We do this before the format checker, since it has
# some probability of failing spuriously, while this check never should.
#
# In general, we can't assume that the commits are signed off by author
# pushing, so we settle for just checking that there is a signoff at all.
SIGNED_OFF=$(git rev-list --no-merges --grep "^Signed-off-by: " "$RANGE")
NOT_SIGNED_OFF=$(git rev-list --no-merges "$RANGE" | grep -Fxv "$SIGNED_OFF")
NOT_SIGNED_OFF=$(git rev-list --no-merges "$RANGE" | grep -Fxv "$SIGNED_OFF" | grep -Fxv "$WHITE_LIST")

if [ -n "$NOT_SIGNED_OFF" ]
then
echo >&2 "ERROR: The following commits do not have DCO signoff:"
Expand Down