From 7c563660041b232d10019fa591b5cd35219092ff Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 26 May 2020 21:46:16 -0700 Subject: [PATCH 1/4] feat: add a mailmap file This will allow us to dedup contributors when generating release notes. --- .mailmap | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 290 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000000..ef596933c29 --- /dev/null +++ b/.mailmap @@ -0,0 +1,290 @@ +@RubenKelevra +Aaron Hill +Adam Gashlin +Adam Uhlir +Adin Schmahmann +Adrian Lanzafame +Adrian Ulrich +Alan Shaw +Alec Brickner +Alex +Alfie John +Alfonso Montero +Ali Mirlou +Andres Buritica +Andrew Chin +Andrew Nesbitt +Andy Leap +Antti Kaihola +Artem Andreenko +Arthur Elliott +Bamvor Zhang +Baptiste Jonglez +Bernhard M. Wiedemann +Boris Mann +Brendan Mc +Brendan McMillion +Brendan O'Brien +Brian Tiger Chow +Brian Tiger Chow +Caian +Caio Alonso +Carlos Cobo +Casey Chance +Cayman Nava +Chas Leichner +Chris Boddy +Chris Chinchilla +Chris Grimmett +Chris P +Christopher Sasarak +Christian Couder +Christian Kniep +Christopher Buesser +Cole Brown +Corbin Page +Cornelius Toole +Dan <35669742+NukeManDan@users.noreply.github.com> +Daniel Aleksandersen +Daniel Grossmann-Kavanagh +Daniel Mack +David +David Braun +David Brennan +David Dias +David Wagner +Devin +Dimitris Apostolou +Diogo Silva +Dirk McCormick +Djalil Dreamski <32184973+dreamski21@users.noreply.github.com> +Dominic Della Valle +Dominic Tarr +Ian Preston +Dylan Powers +Edison Lee +Elias Gabrielsson +Emery Hemingway +Enrique Erne +Eoghan Ó Carragáin +Erik Ingenito +Esteban +Ethan Buchman +Etienne Laurin +Forrest Weston +Francesco Canessa +Frank Sachsenheim +Frederik Riedel +Friedel Ziegelmayer +George Antoniadis +George Masgras +Giulitti Salvatore +Giuseppe Bertone +Gowtham G +Harald Nordgren +Harlan T Wood +Hector Sanjuan +Henrique Dias +Henry +Herman Junge +Hlib +Ho-Sheng Hsiao +Hucg <41573766+hcg1314@users.noreply.github.com> +Iaroslav Gridin +Igor Velkov +Ivan +JP Hastings-Spital +Jack Loughran <30052269+jackloughran@users.noreply.github.com> +Jakub Sztandera +Jakub Kaczmarzyk +James Stanley +Jamie Wilkinson +Jan Winkelmann +Jason Carver +Jeff Thompson +Jeromy Johnson +Jesse Weinstein +Jessica Schilling +Jim McDonald +John Reed +Johnny <9611008+johnnymatthews@users.noreply.github.com> +Jon Choi +Jonathan Dahan +Jordan Danford +Jorropo +Juan Batiz-Benet +Justin Drake +Kacper Łukawski +Karthik Bala +Kejie Zhang <601172892@qq.com> +Kerem +Kevin Atkinson +Kevin Simper +Kevin Wallace +Kirill Goncharov +Kishan Mohanbhai Sagathiya +Knut Ahlers +Konstantin Koroviev +Koushik Roy +Kristoffer Ström +Kuro1 <412681778@qq.com> +Lars Gierth +Leo Arias +Li Zheng +Lorenzo Manacorda +Lorenzo Setale +Louis Thibault +Lucas Garron +Lucas Molas +Marcin Janczyk +Marcin Rataj +Markus Amalthea Magnuson +Marten Seemann +Masashi Salvador Mitsuzawa +Massino Tinovan +Mat Kelly +Mathijs de Bruin +Matouš Skála +Matt Bell +Matt Joiner +Max Chechel +Max Kerp +Mib Kd743naq +Michael Avila +Michael Lovci +Michael Muré +Michael Pfister +Michelle Lee +Miguel Torres +Mikaela Suomalainen +Mildred Ki'Lya +Molly +Muneeb Ali +Mykola Nikishov +Nathan Musoke +Nick Hamann +Oli Evans +Or Rikon +Overbool +Patrick Connolly +Pavol Rusnak +Peter Borzov +Peter Rabbitson +Peter Wu +Philip Nelson +Pierre-Alain TORET +PoorPockets McNewHold +Pretty Please Mark Darkly <55382229+pleasemarkdarkly@users.noreply.github.com> +Péter Szilágyi +Quantomic +Quinn Slack +Raúl Kripalani +ReadmeCritic +Remco Bloemen +Richard Littauer +RideWindX +Rob Brackett +Robert Carlsen +Rod Vagg +Roerick Sweeney +Roman Khafizianov +Roman Proskuryakov +Ronsor +RubenKelevra +Ryan Carver +Ryan Morey +SH +Sag0Sag0 +Sander Pick +Scott Bigelow +Sean Lang +Shanti Bouchez-Mongardé +Shaun Bruce +Sherod Taylor +Simon Kirkby +Simon Menke +Siraj Ravel +Siva Chandran +Spartucus +Stephan Kulla +Stephan Seidt +Stephen Sugden +Stephen Whitmore +Steve Recio +Steven Allen +Steven Vandevelde +Sönke Hahn +TUSF +Tarnay Kálmán +Thomas Gardner +Tiger +Tim Groeneveld +Tim Stahel +Timothy Hobbs +Tom O'Donnell +Tom Swindell +Tommi Virtanen +Tonis Tiigi +Tor Arne Vestbø +Travis Person +Tylar +John Reed +Vasil Dimov +Vijayee Kulkaa +Vikram +Vitor Baptista +W. Trevor King +Wes Morgan +Will Scott +Willi Butz +Xiaoyi Wang +Yuval Langer +Zander Mackie +ZenGround0 +achingbrain +adamliesko +anarcat +bbenshoof +camelmasa +chenminjian <727180553@qq.com> +devedge +dgrisham +drathir +epitron +eric wu +flowed +forstmeier +fyrchik +gatesvp +hannahhoward +hikerpig +hoenirvili +hucg +ivan386 +klauspost +kpcyrd +kvm2116 +mateon1 +matrushka +michael +myself659 +nmalhotra +palkeo +requilence +rht +rob-deutsch +slothbag +sroerick +swedneck <40505480+swedneck@users.noreply.github.com> +tarekbadr +tcme +tg +theswitch +verokarhu +vitzli +vyzo +wzhd +zramsay +Łukasz Magiera +ᴍᴀᴛᴛ ʙᴇʟʟ +ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ From 30dcc26be848389a6d6f0af43a1a0b140f7b9954 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Tue, 26 May 2020 21:46:45 -0700 Subject: [PATCH 2/4] feat: support the mailmap file in mkreleasenotes This will use either the mailmap file in the current repo, or the mailmap file in the target repo, when generating the contributor stats. --- bin/mkreleaselog | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bin/mkreleaselog b/bin/mkreleaselog index c30ee7051df..0588adaee24 100755 --- a/bin/mkreleaselog +++ b/bin/mkreleaselog @@ -33,15 +33,22 @@ AUTHORS=( NL=$'\n' +ROOT_DIR="$(git rev-parse --show-toplevel)" + msg() { echo "$*" >&2 } statlog() { - rpath="$GOPATH/src/$1" - start="${2:-}" - end="${3:-HEAD}" - git -C "$rpath" log --shortstat --no-merges --pretty="tformat:%H%n%aN%n%aE" "$start..$end" | while + local rpath="$GOPATH/src/$1" + local start="${2:-}" + local end="${3:-HEAD}" + local mailmap_file="$rpath/.mailmap" + if ! [[ -e "$mailmap_file" ]]; then + mailmap_file="$ROOT_DIR/.mailmap" + fi + + git -C "$rpath" -c mailmap.file="$mailmap_file" log --use-mailmap --shortstat --no-merges --pretty="tformat:%H%n%aN%n%aE" "$start..$end" | while read hash read name read email From 3849c0fb80ba39de9dca0620d8870c73e687779c Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 27 May 2020 10:22:28 -0700 Subject: [PATCH 3/4] chore(mailcap): change ribasushi addresses Co-authored-by: Peter Rabbitson --- .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index ef596933c29..e0ba27dd523 100644 --- a/.mailmap +++ b/.mailmap @@ -169,7 +169,7 @@ Overbool Patrick Connolly Pavol Rusnak Peter Borzov -Peter Rabbitson +Peter Rabbitson Peter Wu Philip Nelson Pierre-Alain TORET From 1a161c2351e812b81f77b6c0628476ac5d6c5949 Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Wed, 27 May 2020 10:22:44 -0700 Subject: [PATCH 4/4] chore(mailcap): document rational Co-authored-by: Peter Rabbitson --- .mailmap | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.mailmap b/.mailmap index e0ba27dd523..b8713c1839f 100644 --- a/.mailmap +++ b/.mailmap @@ -1,3 +1,9 @@ +# This file allows re-mapping author names/emails +# while maintaining the integrity of the repository +# +# Spec: https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html#_mapping_authors +# + @RubenKelevra Aaron Hill Adam Gashlin