From: Daniel Arndt <arndtd@ornl.gov>
Date: Thu, 6 Feb 2020 05:00:42 +0000 (-0600)
Subject: Ignore merge commits in author check
X-Git-Tag: v9.2.0-rc1~563^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=979139bf368cac9e39187b4e216d9ee3d833d6a7;p=dealii.git

Ignore merge commits in author check
---

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'"