diff --git a/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn new file mode 100644 index 0000000000..241a07ff29 --- /dev/null +++ b/doc/todo/patch:_Add_names_to_.mailmap_to_remove_duplicates_from_git_shortlog.mdwn @@ -0,0 +1,141 @@ +Hi, +these three patches sort .mailmap to get consistent ordering, add nine +names with proper emails to it, and then there is the third one, which +contains all the joeyh changes. I put them in a separate patch in case +you have other opinions about that. + +I notice you're not a fan of GitHub pull requests, and attachments +wasn't allowed here, so I just paste a `cat 000* >all.patch` here, hope +that's ok. The branches are also available from + as the branches "edit-mailmap" +(this version) and "edit-mailmap.wip" (the whole process) in case that's +easier. + +There will be more "useful" patches in the future, have started browsing +"Learn you a Haskell for great good", it's awesome. I'll have to get the +build working first, though. There is some dependency problem: + +[[!format hs """ + +$ make +if [ "cabal " = ./Setup ]; then ghc --make Setup; fi +cabal configure +Resolving dependencies... + +Utility/Exception.hs:25:18: + Could not find module `Control.Monad.Catch' + Perhaps you meant + Control.Monad.CatchIO (from MonadCatchIO-mtl-0.3.0.4) + Control.Monad.Cont (needs flag -package mtl-2.1.1) + Control.Monad.State (needs flag -package mtl-2.1.1) + Use -v to see a list of the files searched for. +make: *** [Build/SysConfig.hs] Error 1 + +"""]] + +Mentioning it just in case you have a quick solution. Have tried to fix +it by summoning cabal in various ways, but no luck yet. The OS used is +Debian GNU/Linux 7.8 (wheezy) on x86_64. + +[[!format sh """ + +From 20317aff9fbb8662aaeda4aa2285f92e728adc58 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= +Date: Sat, 2 May 2015 17:22:48 +0200 +Subject: [PATCH 1/3] Filter .mailmap through "sort -u" for predictability + +--- + .mailmap | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.mailmap b/.mailmap +index 275b236..5d51042 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -1,7 +1,7 @@ + Joey Hess http://joey.kitenet.net/ +-Joey Hess http://joeyh.name/ + Joey Hess http://joeyh.name/ ++Joey Hess http://joeyh.name/ ++Richard Hartmann https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U + Yaroslav Halchenko + Yaroslav Halchenko http://yarikoptic.myopenid.com/ + Yaroslav Halchenko https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY +-Richard Hartmann https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U +-- +2.4.0 + +From b216bfdb3ab65f025e46c7fcdc86db3a3440b0af Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= +Date: Mon, 4 May 2015 15:36:41 +0200 +Subject: [PATCH 2/3] .mailmap: Add nine more uncontroversial names + +Including only those with a proper email where there is no doubt about +which is the correct one. +--- + .mailmap | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/.mailmap b/.mailmap +index 5d51042..2dafcea 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -1,7 +1,20 @@ ++Antoine Beaupré anarcat ++Antoine Beaupré https://id.koumbit.net/anarcat ++Greg Grossmeier http://grossmeier.net/ ++Jimmy Tang jtang ++Joachim Breitner http://www.joachim-breitner.de/ + Joey Hess http://joey.kitenet.net/ + Joey Hess http://joeyh.name/ + Joey Hess http://joeyh.name/ ++Johan Kiviniemi http://johan.kiviniemi.name/ ++Johan Kiviniemi http://johan.kiviniemi.name/ ++Nicolas Pouillard http://ertai.myopenid.com/ ++Peter Simons Peter Simons ++Peter Simons http://peter-simons.myopenid.com/ ++Philipp Kern http://phil.0x539.de/ + Richard Hartmann https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U + Yaroslav Halchenko + Yaroslav Halchenko http://yarikoptic.myopenid.com/ + Yaroslav Halchenko https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY ++Øyvind A. Holm http://sunny256.sunbase.org/ ++Øyvind A. Holm https://sunny256.wordpress.com/ +-- +2.4.0 + +From b730720bf85217051b0bd6414650f3bfd5928edb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=98yvind=20A=2E=20Holm?= +Date: Mon, 4 May 2015 15:46:29 +0200 +Subject: [PATCH 3/3] .mailmap: Add all variations for Joey Hess + +--- + .mailmap | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/.mailmap b/.mailmap +index 2dafcea..3013a39 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -3,9 +3,17 @@ Antoine Beaupré https://id.koumbit.net/anarcat http://grossmeier.net/ + Jimmy Tang jtang + Joachim Breitner http://www.joachim-breitner.de/ ++Joey Hess Joey Hess ++Joey Hess Joey Hess ++Joey Hess Joey Hess ++Joey Hess Joey Hess ++Joey Hess Joey Hess ++Joey Hess Joey Hess ++Joey Hess Joey Hess + Joey Hess http://joey.kitenet.net/ + Joey Hess http://joeyh.name/ + Joey Hess http://joeyh.name/ ++Joey Hess https://www.google.com/accounts/o8/id?id=AItOawmJfIszzreLNvCqzqzvTayA9_9L6gb9RtY + Johan Kiviniemi http://johan.kiviniemi.name/ + Johan Kiviniemi http://johan.kiviniemi.name/ + Nicolas Pouillard http://ertai.myopenid.com/ +-- +2.4.0 + +"""]]