Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mailmap support #7375

Merged
merged 4 commits into from
May 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
296 changes: 296 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
# 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 <[email protected]>
Stebalien marked this conversation as resolved.
Show resolved Hide resolved
Aaron Hill <[email protected]>
Adam Gashlin <[email protected]>
Adam Uhlir <[email protected]>
Adin Schmahmann <[email protected]>
Adrian Lanzafame <[email protected]>
Adrian Ulrich <[email protected]>
Alan Shaw <[email protected]> <[email protected]>
Alec Brickner <[email protected]>
Alex <[email protected]>
Alfie John <[email protected]>
Alfonso Montero <[email protected]>
Ali Mirlou <[email protected]>
Andres Buritica <[email protected]>
Andrew Chin <[email protected]>
Andrew Nesbitt <[email protected]>
Andy Leap <[email protected]>
Antti Kaihola <[email protected]>
Artem Andreenko <[email protected]>
Arthur Elliott <[email protected]>
Bamvor Zhang <[email protected]>
Baptiste Jonglez <[email protected]>
Bernhard M. Wiedemann <[email protected]>
Boris Mann <[email protected]>
Brendan Mc <[email protected]>
Brendan McMillion <[email protected]>
Brendan O'Brien <[email protected]>
Brian Tiger Chow <[email protected]>
Brian Tiger Chow <[email protected]>
Caian <[email protected]>
Caio Alonso <[email protected]>
Carlos Cobo <[email protected]>
Casey Chance <[email protected]>
Cayman Nava <[email protected]>
Chas Leichner <[email protected]>
Chris Boddy <[email protected]>
Chris Chinchilla <[email protected]>
Chris Grimmett <[email protected]>
Chris P <[email protected]>
Christopher Sasarak <[email protected]>
Christian Couder <[email protected]>
Christian Kniep <[email protected]>
Christopher Buesser <[email protected]>
Cole Brown <[email protected]>
Corbin Page <[email protected]>
Cornelius Toole <[email protected]>
Dan <[email protected]>
Daniel Aleksandersen <[email protected]>
Daniel Grossmann-Kavanagh <[email protected]>
Daniel Mack <[email protected]>
David <[email protected]>
David Braun <[email protected]>
David Brennan <[email protected]>
David Dias <[email protected]> <[email protected]>
David Wagner <[email protected]>
Devin <[email protected]>
Dimitris Apostolou <[email protected]>
Diogo Silva <[email protected]>
Dirk McCormick <[email protected]>
Djalil Dreamski <[email protected]>
Dominic Della Valle <[email protected]> <[email protected]> <[email protected]> <[email protected]>
Dominic Tarr <[email protected]>
Ian Preston <[email protected]> <[email protected]>
Dylan Powers <[email protected]>
Edison Lee <[email protected]>
Elias Gabrielsson <[email protected]>
Emery Hemingway <[email protected]>
Enrique Erne <[email protected]>
Eoghan Ó Carragáin <[email protected]>
Erik Ingenito <[email protected]>
Esteban <[email protected]>
Ethan Buchman <[email protected]>
Etienne Laurin <[email protected]>
Forrest Weston <[email protected]> <[email protected]> <[email protected]>
Francesco Canessa <[email protected]>
Frank Sachsenheim <[email protected]>
Frederik Riedel <[email protected]>
Friedel Ziegelmayer <[email protected]>
George Antoniadis <[email protected]>
George Masgras <[email protected]>
Giulitti Salvatore <[email protected]>
Giuseppe Bertone <[email protected]>
Gowtham G <[email protected]>
Harald Nordgren <[email protected]>
Harlan T Wood <[email protected]>
Hector Sanjuan <[email protected]> <[email protected]> <[email protected]>
Henrique Dias <[email protected]>
Henry <[email protected]>
Herman Junge <[email protected]>
Hlib <[email protected]>
Ho-Sheng Hsiao <[email protected]>
Hucg <[email protected]>
Iaroslav Gridin <[email protected]>
Igor Velkov <[email protected]>
Ivan <[email protected]>
JP Hastings-Spital <[email protected]>
Jack Loughran <[email protected]>
Jakub Sztandera <[email protected]> <[email protected]> <[email protected]> <[email protected]>
Jakub Kaczmarzyk <[email protected]>
James Stanley <[email protected]>
Jamie Wilkinson <[email protected]>
Jan Winkelmann <[email protected]> <[email protected]>
Jason Carver <[email protected]>
Jeff Thompson <[email protected]>
Jeromy Johnson <[email protected]> <[email protected]> <[email protected]> <[email protected]>
Jesse Weinstein <[email protected]>
Jessica Schilling <[email protected]>
Jim McDonald <[email protected]>
John Reed <[email protected]> <[email protected]>
Johnny <[email protected]>
Jon Choi <[email protected]>
Jonathan Dahan <[email protected]>
Jordan Danford <[email protected]>
Jorropo <[email protected]>
Juan Batiz-Benet <[email protected]>
Justin Drake <[email protected]>
Kacper Łukawski <[email protected]>
Karthik Bala <[email protected]>
Kejie Zhang <[email protected]>
Kerem <[email protected]>
Kevin Atkinson <[email protected]>
Kevin Simper <[email protected]>
Kevin Wallace <[email protected]>
Kirill Goncharov <[email protected]>
Kishan Mohanbhai Sagathiya <[email protected]>
Knut Ahlers <[email protected]>
Konstantin Koroviev <[email protected]>
Koushik Roy <[email protected]>
Kristoffer Ström <[email protected]>
Kuro1 <[email protected]>
Lars Gierth <[email protected]> <[email protected]>
Leo Arias <[email protected]> <[email protected]>
Li Zheng <[email protected]>
Lorenzo Manacorda <[email protected]>
Lorenzo Setale <[email protected]>
Louis Thibault <[email protected]>
Lucas Garron <[email protected]>
Lucas Molas <[email protected]>
Marcin Janczyk <[email protected]>
Marcin Rataj <[email protected]>
Markus Amalthea Magnuson <[email protected]>
Marten Seemann <[email protected]>
Masashi Salvador Mitsuzawa <[email protected]>
Massino Tinovan <massino@droppod,io>
Mat Kelly <[email protected]>
Mathijs de Bruin <[email protected]>
Matouš Skála <[email protected]>
Matt Bell <[email protected]>
Matt Joiner <[email protected]>
Max Chechel <[email protected]> <[email protected]>
Max Kerp <[email protected]>
Mib Kd743naq <[email protected]>
Michael Avila <[email protected]> <[email protected]>
Michael Lovci <[email protected]>
Michael Muré <[email protected]> <[email protected]> <[email protected]>
Michael Pfister <[email protected]>
Michelle Lee <[email protected]>
Miguel Torres <[email protected]>
Mikaela Suomalainen <[email protected]>
Mildred Ki'Lya <[email protected]>
Molly <[email protected]>
Muneeb Ali <[email protected]>
Mykola Nikishov <[email protected]>
Nathan Musoke <[email protected]>
Nick Hamann <[email protected]>
Oli Evans <[email protected]>
Or Rikon <[email protected]>
Overbool <[email protected]>
Patrick Connolly <[email protected]>
Pavol Rusnak <[email protected]>
Peter Borzov <[email protected]> <[email protected]>
Peter Rabbitson <[email protected]> <[email protected]> <[email protected]> <[email protected]>
Peter Wu <[email protected]>
Philip Nelson <[email protected]>
Pierre-Alain TORET <[email protected]>
PoorPockets McNewHold <[email protected]>
Pretty Please Mark Darkly <[email protected]>
Péter Szilágyi <[email protected]>
Quantomic <[email protected]>
Quinn Slack <[email protected]>
Raúl Kripalani <[email protected]> <[email protected]>
ReadmeCritic <[email protected]>
Remco Bloemen <[email protected]>
Richard Littauer <[email protected]>
RideWindX <[email protected]>
Rob Brackett <[email protected]>
Robert Carlsen <[email protected]>
Rod Vagg <[email protected]>
Roerick Sweeney <[email protected]>
Roman Khafizianov <[email protected]>
Roman Proskuryakov <[email protected]>
Ronsor <[email protected]>
RubenKelevra <[email protected]>
Ryan Carver <[email protected]>
Ryan Morey <[email protected]>
SH <[email protected]>
Sag0Sag0 <[email protected]>
Sander Pick <[email protected]>
Scott Bigelow <[email protected]>
Sean Lang <[email protected]>
Shanti Bouchez-Mongardé <[email protected]>
Shaun Bruce <[email protected]>
Sherod Taylor <[email protected]>
Simon Kirkby <[email protected]>
Simon Menke <[email protected]>
Siraj Ravel <[email protected]> <[email protected]> <[email protected]>
Siva Chandran <[email protected]>
Spartucus <[email protected]>
Stephan Kulla <[email protected]>
Stephan Seidt <[email protected]> <[email protected]>
Stephen Sugden <[email protected]>
Stephen Whitmore <[email protected]> <[email protected]>
Steve Recio <[email protected]>
Steven Allen <[email protected]>
Steven Vandevelde <[email protected]>
Sönke Hahn <[email protected]>
TUSF <[email protected]>
Tarnay Kálmán <[email protected]>
Thomas Gardner <[email protected]>
Tiger <[email protected]>
Tim Groeneveld <[email protected]>
Tim Stahel <[email protected]>
Timothy Hobbs <[email protected]>
Tom O'Donnell <[email protected]>
Tom Swindell <[email protected]>
Tommi Virtanen <[email protected]>
Tonis Tiigi <[email protected]>
Tor Arne Vestbø <[email protected]>
Travis Person <[email protected]> <[email protected]>
Tylar <[email protected]>
John Reed <[email protected]>
Vasil Dimov <[email protected]>
Vijayee Kulkaa <[email protected]>
Vikram <[email protected]>
Vitor Baptista <[email protected]>
W. Trevor King <[email protected]>
Wes Morgan <[email protected]>
Will Scott <[email protected]>
Willi Butz <[email protected]>
Xiaoyi Wang <[email protected]>
Yuval Langer <[email protected]>
Zander Mackie <[email protected]>
ZenGround0 <[email protected]>
achingbrain <[email protected]>
adamliesko <[email protected]>
anarcat <[email protected]>
bbenshoof <[email protected]>
camelmasa <[email protected]>
chenminjian <[email protected]>
devedge <[email protected]>
dgrisham <[email protected]>
drathir <[email protected]>
epitron <[email protected]>
eric wu <[email protected]>
flowed <[email protected]>
forstmeier <[email protected]>
fyrchik <[email protected]>
gatesvp <[email protected]>
hannahhoward <[email protected]>
hikerpig <[email protected]>
hoenirvili <[email protected]>
hucg <hucg>
ivan386 <[email protected]>
klauspost <[email protected]>
kpcyrd <[email protected]>
kvm2116 <[email protected]>
mateon1 <[email protected]>
matrushka <[email protected]>
michael <[email protected]>
myself659 <[email protected]>
nmalhotra <[email protected]>
palkeo <[email protected]>
requilence <[email protected]>
rht <[email protected]> <[email protected]>
rob-deutsch <[email protected]>
slothbag <slothbag>
sroerick <[email protected]>
swedneck <[email protected]>
tarekbadr <[email protected]>
tcme <[email protected]>
tg <[email protected]>
theswitch <[email protected]>
verokarhu <[email protected]>
vitzli <[email protected]>
vyzo <[email protected]>
wzhd <[email protected]>
zramsay <[email protected]> <[email protected]>
Łukasz Magiera <[email protected]> <[email protected]>
ᴍᴀᴛᴛ ʙᴇʟʟ <[email protected]>
ᴠɪᴄᴛᴏʀ ʙᴊᴇʟᴋʜᴏʟᴍ <[email protected]>
15 changes: 11 additions & 4 deletions bin/mkreleaselog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down