Include “Co-authored-by” attributions when calculating authors

(cherry picked from commit cb301769895adc941845b16d124e0bff292a74c3)

diff --git a/.mailmap b/.mailmap
index db7f734553b65c107f3c6891e35b9f725c9ab128..c3a5ad8d531fbcb658620c76bc5fc65f02aa9356 100644 (file)
--- 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 1bd2dcd4296b537be4a0e3a489a31ca63288343a..d86984c064323024d7a6b3261a2c09da21bd6667 100644 (file)
--- 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