From e0fc7b9bde2e615573deff51f0a771a917e29c3a Mon Sep 17 00:00:00 2001 From: Lev Bishop <18673315+levbishop@users.noreply.github.com> Date: Mon, 24 Jun 2019 16:35:36 -0400 Subject: [PATCH] Add a mailmap to qiskit-terra (#2666) This adds a mailmap for qiskit terra in order to merge multiple commit identities into a single author and to choose a canonical name/email for the authors suitable for the attribution scripts to use for generating the AUTHORS file, bibtex file, and zenodo authorship metadata. I did a small amount of work and figured out full names for a few authors who used opaque github ids. I didn't do too much detective work to unmask the last few in case they are trying to be anonymous on purpose. This resolves the terra piece of Qiskit/qiskit#229 I preferred the noreply.github email if one was present and failing that preferred an IBM email over any other. Without this PR git-shortlog thinks there are 146 unique authors. After this PR merges duplicates, it shows 105 unique authors. This is 5 fewer than the "100 contributors" quoted on the github webpage because of: 1. 2 authors who have commits but seem to have no github account: Vojtech Havlicek, Christian Claus 2. 3 authors who have a github account but have committed using an email address not attached with that account: @jerrymchow @Trabing @mryu1 * Initial mailmap * Update mailmap * Tweak mailmap and add help comments * Update .mailmap * Update mailmap from contributor comments * Add @nkanazawa1989 to mailmap * Update .mailmap * Add @sathayen full name from PR comments * Add comment about mailmaps for other elements. Narrow match for local addresses * Mailmap consistency with qiskit/qiskit * Add @gadial name from ignis mailmap The ignis mailmap file [1] included the full name for @gadial. This commit just propogates that over to terra too. [1] https://github.com/Qiskit/qiskit-ignis/blob/master/.mailmap * Mailmap add entries to fix Co-Authored-By lines --- .mailmap | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..53897a0e43 --- /dev/null +++ b/.mailmap @@ -0,0 +1,78 @@ +# Entries in this file are made for two reasons: +# 1) to merge multiple git commit authors that correspond to a single author +# 2) to change the canonical name and/or email address of an author. +# +# Format is: +# Canonical Name commit name +# \--------------+---------------/ \----------+-------------/ +# replace find +# See also: 'git shortlog --help' and 'git check-mailmap --help'. +# +# If you don't like the way your name is cited by qiskit, please feel free to +# open a pull request against this file to set your preferred naming. +# +# Note that each qiskit element uses its own mailmap so it may be necessary to +# propagate changes in other repos for consistency. +# +Abdón Rodríguez Davila +Abigail J. Cross +Albert Frisch +Albert Frisch +Ali Javadi-Abhari +Ali Javadi-Abhari +Andrew W. Cross +Andrew W. Cross Andrew Cross +Andrew W. Cross Andrew Cross +Anna Phan <9410731+attp@users.noreply.github.com> +Antonio D. Córcoles-Gonzales +Antonio Mezzacapo <30698465+antoniomezzacapo@users.noreply.github.com> +Carmen Recio Valcarce <49230820+carmenrv@users.noreply.github.com> +Chris Culver +Christian Claus +Christophe Vuillot +Christopher J. Wood +Daniel Egger <38065505+eggerdj@users.noreply.github.com> +Diego M. Rodríguez +Erick Winston +Fran Cabrera +Fran Cabrera Fran Cabrera +Gadi Aleksandrowicz +Ismael Faro Sertage +Ismael Faro Sertage +Ismail Yunus Akhalwaya +Ismail Yunus Akhalwaya <30803146+ismaila-at-za-ibm@users.noreply.github.com> +Jack J. Woehr <4604036+jwoehr@users.noreply.github.com> +Jay M. Gambetta +Jerry M. Chow +Jesús Pérez +Jonathan A. Wildstrom <34069155+jwildstr-ibm@users.noreply.github.com> +Jonathan A. Wildstrom <34069155+jwildstr-ibm@users.noreply.github.com> +Jorge Carballo +Juan Cruz-Benito +Juan Gomez-Mosquera +Juan Gomez-Mosquera +Kevin Krsulich +Lev S. Bishop <18673315+levbishop@users.noreply.github.com> +Luciano Bello +Luciano Bello +Luciano Bello +Maddy Tod <40489777+maddy-tod@users.noreply.github.com> +Marco Pistoia +Martin Sandberg +Mathieu Tillet <50137038+mtillet@users.noreply.github.com> +Matthew Treinish +Matt Stypulkoski <50181769+Matt-Stypulkoski@users.noreply.github.com> +Max Reuter +Naoki Kanazawa <39517270+nkanazawa1989@users.noreply.github.com> +Paul Nation +Peng Liu <34400304+liupibm@users.noreply.github.com> +Pradeep Niroula +Prakash Murali +Rafal Wieczorek +Raphaël Lambert <49641842+rfclambert@users.noreply.github.com> +Rudy Raymond +Salvador de la Puente González +Ninad Sathaye +Thomas Alexander +Toshinari Itoko +Yael Ben-Haim