From d4b6659ecb376493d5771333b6aef3b3b8669c27 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Wed, 15 Jan 2020 22:49:23 +0100
Subject: [PATCH] =?UTF-8?q?Include=20=E2=80=9CCo-authored-by=E2=80=9D=20at?=
 =?UTF-8?q?tributions=20when=20calculating=20authors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cb301769895adc941845b16d124e0bff292a74c3)
---
 .mailmap  | 2 +-
 dev.mk.in | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index db7f734553..c3a5ad8d53 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,7 +1,7 @@
 Anders F Björklund <anders.f.bjorklund@gmail.com>
 Anders F Björklund <anders.f.bjorklund@gmail.com> <anders@itension.se>
 Anders F Björklund <anders.f.bjorklund@gmail.com> <anders@psqr.se>
-Andrew P Boie <andrew.p.boie@intel.com>
+Andrew Boie <andrew.p.boie@intel.com>
 Bernhard Bauer <bauerb@chromium.org> <bauerb@google.com>
 Chiaki Ishikawa <ishikawa@yk.rim.or.jp>
 Clemens Rabe <clemens.rabe@gmail.com> <clemens.rabe@clemensrabe.de>
diff --git a/dev.mk.in b/dev.mk.in
index 1bd2dcd429..d86984c064 100644
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -190,9 +190,10 @@ doc/ccache.1: doc/MANUAL.xml
 
 .PHONY: update-authors
 update-authors:
-	git log --pretty=format:"%H %aN" \
-	  | grep -Ev 'd7c5056beda5483fcd5c098165fffd9be86fe98d' \
-	  | sed -r 's/[^ ]+/*/' \
+	git log --pretty=format:"%H %aN%n%(trailers:only)" \
+	  | grep -Ev 'd7c5056beda5483fcd5c098165fffd9be86fe98d|http|Conflicts:' \
+	  | grep '^[^ ]' \
+	  | sed -r -e 's/[^ ]+/*/' -e 's/<.*//' -e 's/ *$$//' \
 	  | sort -u \
 	  | perl -00 -p -i -e 's/^\*.*/<STDIN> . "\n"/es' doc/AUTHORS.adoc