From 979139bf368cac9e39187b4e216d9ee3d833d6a7 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Wed, 5 Feb 2020 23:00:42 -0600 Subject: [PATCH] Ignore merge commits in author check --- contrib/utilities/indent_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/utilities/indent_common.sh b/contrib/utilities/indent_common.sh index 8861f659c7..57c5c0d9b0 100644 --- a/contrib/utilities/indent_common.sh +++ b/contrib/utilities/indent_common.sh @@ -82,7 +82,7 @@ checks() { # Finally, to stay sane, just go back until the beginning of 2019 for now. # # first user names: - git log --since "2019-01-01" --format="%aN" | sort -u | while read name ; do + git log --since "2019-01-01" --format="%aN" --no-merges | sort -u | while read name ; do words=($name) if [ "${#words[@]}" -lt "2" ]; then echo "invalid author '$name' without firstname and lastname" @@ -94,7 +94,7 @@ checks() { done || exit 2 # now emails: - git log --since "2019-01-01" --format="%aE" | sort -u | while read email ; do + git log --since "2019-01-01" --format="%aE" --no-merges | sort -u | while read email ; do words=($name) if ! echo "$email" | grep -q "\."; then echo "invalid email '$email'" -- 2.39.5