Merge pull request #9093 from nextcloud/more-hooks-improvements

pre-push hook: Exclude merges from signoff check
This commit is contained in:
Tobias Kaminsky 2021-10-22 08:37:19 +02:00 committed by GitHub
commit f55c7c8785
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -15,7 +15,7 @@ while read local_ref local_sha remote_ref remote_sha; do
fi fi
# Check for commits without sign-off # Check for commits without sign-off
commit=$(git rev-list --grep 'Signed-off-by' --invert-grep "$range") commit=$(git rev-list --no-merges --grep 'Signed-off-by' --invert-grep "$range")
if [ -n "$commit" ]; then if [ -n "$commit" ]; then
echo >&2 "Found commits without sign-off in $local_ref. Aborting push. Offending commits:" echo >&2 "Found commits without sign-off in $local_ref. Aborting push. Offending commits:"
echo >&2 "$commit" echo >&2 "$commit"