diff options
author | Joseph Herlant <herlantj@gmail.com> | 2018-04-23 20:09:37 -0700 |
---|---|---|
committer | Joseph Herlant <aerostitch@users.noreply.github.com> | 2018-04-24 07:56:26 -0700 |
commit | 0fffd1877ea416d26ac4db8307d2299f835e35e3 (patch) | |
tree | c77fb9130236437769e5d6a8370621afd94da460 | |
parent | 5482a3c2ce4a6ce63a9dd1090915e27a1ce8992d (diff) | |
download | navit-0fffd1877ea416d26ac4db8307d2299f835e35e3.tar.gz |
Update:CI:Use mailmap to cleanup the authors list
-rw-r--r-- | .mailmap | 35 | ||||
-rw-r--r-- | AUTHORS | 5 | ||||
-rw-r--r-- | ci/generate_contributors.sh | 23 |
3 files changed, 39 insertions, 24 deletions
diff --git a/.mailmap b/.mailmap new file mode 100644 index 000000000..1f3ba9b08 --- /dev/null +++ b/.mailmap @@ -0,0 +1,35 @@ +Cedric Paille <cedricpaille@gmail.com> Cedric PAILLE <cedricpaille@gmail.com> +Charles Curley <charlescurley@users.noreply.github.com> Charles Curley <charlescurley@charlescurley.com> +gauthier60 <gauthier60@ffa7fe5e-494d-0410-b361-a75ebd5db220> Gauthier60 <Gauthier60@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Joseph Herlant <aerostitch@users.noreply.github.com> Joseph Herlant <herlantj@gmail.com> +Marc Capdeville <mcapdeville@users.noreply.github.com> Marc CAPDEVILLE <marc@icrea-technologies.fr> +Marc Capdeville <mcapdeville@users.noreply.github.com> mcapdeville <m.capdeville@no-log.org> +Patrick Höhn <hoehnp@users.noreply.github.com> Patrick Höhn <hoehnp@gmx.de> +Pierre Grandin <pgrandin@users.noreply.github.com> Pierre GRANDIN <pgrandin@users.noreply.github.com> +Pierre Grandin <pgrandin@users.noreply.github.com> Pierre GRANDIN <grandinp@altern.org> +Pierre Grandin <pgrandin@users.noreply.github.com> Pierre Grandin <grandinp@altern.org> +Pierre Grandin <pgrandin@users.noreply.github.com> Pierre Grandin <grandinp@gmail.com> +Pierre Grandin <pgrandin@users.noreply.github.com> kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Sebastian Leske <sebastian.leske@sleske.name> Sebastian Leske <Sebastian.Leske@sleske.name> +Sebastian Leske <sebastian.leske@sleske.name> sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Stefan Wildemann <metalstrolch@users.noreply.github.com> Stefan Wildemann <gta04@metalstrolche.de> +Stefan Wildemann <metalstrolch@users.noreply.github.com> Stefan Wildemann <metalstrolch@metalstrolche.de> +Stefan Wildemann <metalstrolch@users.noreply.github.com> Stefan Wildemann <stefan.wildemann@metalstrolche.de> +Stefan Wildemann <metalstrolch@users.noreply.github.com> Wildemann Stefan <stefan.wildemann@corpuls.com> +Michael Dankov <mdankov@users.noreply.github.com> Michael Dankov <tryagain@navit-project.org> +Michael Dankov <mdankov@users.noreply.github.com> mdankov <mdankov@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Michael Dankov <mdankov@users.noreply.github.com> mdankov <mdankov@users.noreply.github.com> +youte62 <jeremylheureux@gmail.com> youte62 <jeremylheureux@gmailcom> +Johan Fitié <jfitie@users.noreply.github.com> Johan Fitié <jfitie@gmail.com> +jandegr <jandegr@users.noreply.github.com> jandegr <jandegr1@hotmail.com> +jkoan <jkoan@users.noreply.github.com> jkoan <jkoan@gmx.de> +mvglasow <mvglasow@users.noreply.github.com> mvglasow <michael -at- vonglasow.com> +mvglasow <mvglasow@users.noreply.github.com> mvglasow <michael@vonglasow.com> +mvglasow <mvglasow@users.noreply.github.com> mvglasow <mvglasow@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Manuel Hohmann <xenos1984@users.noreply.github.com> xenos1984 <xenos1984@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Manuel Hohmann <xenos1984@users.noreply.github.com> xenos1984 <mhohmann@physnet.uni-hamburg.de> +Rikky <Rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> rikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Robert Pohlink <pohlinkzei@users.noreply.github.com> Robert Pohlink <pohlinkzei@gmx-topmail.de> +Robert Pohlink <pohlinkzei@users.noreply.github.com> pohlinkzei <pohlinkzei@gmx-topmail.de> +Michael Farmbauer <horwitz@users.sourceforge.net> horwitz <horwitz@ffa7fe5e-494d-0410-b361-a75ebd5db220> +Martin Schaller <martin-s@users.sourceforge.net> martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> @@ -27,7 +27,7 @@ bjasspa bodenseepingu bustersnyvel carcinoma -Cedric PAILLE +Cedric Paille christeck eiten gauthier60 @@ -41,6 +41,7 @@ kelvinzhao klausg korrosa latouche +Manuel Hohmann Martin Schaller mattcallow Michael Farmbauer @@ -49,7 +50,6 @@ norad OmegA_MRS pavel plum_ -rikky Rikky Robotaxi rphlx @@ -62,7 +62,6 @@ tegzed tinloaf woglinde worldcitizen -xenos1984 zaxl zintor zoff99 diff --git a/ci/generate_contributors.sh b/ci/generate_contributors.sh index fe1796cc1..b957d486d 100644 --- a/ci/generate_contributors.sh +++ b/ci/generate_contributors.sh @@ -6,29 +6,15 @@ set -e # output of the git log command. It splits the contributors in 2 groups: # * The "active contributors" are the contributors that authored commits over the last 2 years # * The "retired contributors" are the contributors that have authored commits but not over the last 2 years +# Note: it uses git's mailmap functionnality to get a clean list of users # ########################################################################################################### -# This map is used to map the old authors to the new ones to avoid duplicates -declare -A authorsMap=( - ["Pierre GRANDIN"]="Pierre Grandin" - ["kazer_"]="Pierre Grandin" - ["Patrick Höhn"]="Patrick Höhn" - ["Wildemann Stefan"]="Stefan Wildemann" - ["pohlinkzei"]="Robert Pohlink" - ["mdankov"]="Michael Dankov" - ["sleske"]="Sebastian Leske" - ["mcapdeville"]="Marc Capdeville" - ["Marc CAPDEVILLE"]="Marc Capdeville" - ["Gauthier60"]="gauthier60" - ["horwitz"]="Michael Farmbauer" - ["martin-s"]="Martin Schaller" -) declare -A CONTRIBUTORS=() declare -a authors=() TWO_YEARS_AGO=`date +%s --date="2 years ago"` retiredTitleWritten=false -git log --encoding=utf-8 --full-history --date=short "--format=format:%ad;%an" | +git log --encoding=utf-8 --full-history --date=short --use-mailmap "--format=format:%ad;%aN" | { echo "# Active contributors:" > AUTHORS while read -r line; do @@ -53,11 +39,6 @@ git log --encoding=utf-8 --full-history --date=short "--format=format:%ad;%an" | fi fi - # Remapping authors - if [ -n "${authorsMap[${author}]}" ]; then - author=${authorsMap[${author}]} - fi - # using the map as an easy way to check if the author has already been listed if [ -z "${CONTRIBUTORS[${author}]}" ]; then CONTRIBUTORS[${author}]=${arrLine[0]} |