use git shortlog and .mailmap to remove duplicates

When using the basic log command one of the authors shows up twice:

zsh» git log --all --format='%an <%ae>' | sort -u -k2
Vincent Demeester <vincent@demeester.fr>
Richard Hartmann <richih+github.com@richih.org>
Richard Hartmann <richih.mailinglist@gmail.com>
Dieter Plaetinck <dieter@plaetinck.be>
Corey Quinn <corey@sequestered.net>
Gernot Schulz <post@gernot-schulz.com>

If you instead use the git shortlog version with the .mailmap file you get:

zsh» git shortlog -se --all | cut -f1 --complement | sort -u -k2

Vincent Demeester <vincent@demeester.fr>
Richard Hartmann <richih.mailinglist@gmail.com>
Dieter Plaetinck <dieter@plaetinck.be>
Corey Quinn <corey@sequestered.net>
Gernot Schulz <post@gernot-schulz.com>

Alphabetical sorting on the second field (which, incidentally, may be a middle
name) is preserved.

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..bf08497
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Richard Hartmann <richih.mailinglist@gmail.com> <richih+github.com@richih.org>

diff --git a/tools/list_AUTHORS b/tools/list_AUTHORS
index 2b91ac97945b45ad539e2d00882c6b864009671e..351820564a77614b5b10f335d38cf5ba549d76fa 100755 (executable)
--- a/tools/list_AUTHORS
+++ b/tools/list_AUTHORS
@@ -2,4 +2,4 @@
 
 echo 'Alphabetical list of everyone who ever committed to this repository
 '
 
 echo 'Alphabetical list of everyone who ever committed to this repository
 '

-git log --all --format='%an <%ae>' | sort -u -k2
+git shortlog -se --all | cut -f1 --complement | sort -u -k2