Re: [PATCH v2 000/105] .mailmap: Add mailmap file to have a cleaner git history


Laszlo Ersek
 

On 12/06/19 12:24, Philippe Mathieu-Daude wrote:
The .mailmap git feature helps fixing commit mistakes (in name/email).

The easiest way to use it is with the --use-mailmap flag:

$ git log --use-mailmap

See documentation [1] and [2], and interesting blog [3].

Laszlo replied [4] to v1 explaining stewards want to avoid avoid
cross-domain mapping, and suggested to split in per email-address
patches, so contributors can individually Ack/Nack.
Similarly, stewards can Nack if there is a cross-domain issue, since
these are not obvious to me (they would happen if someone was working
for a company at the time the repository was using SVN, the switched
company and contributed later at the time the repository was passed
to GIT).
I suggest the following:

- Collect feedback (from individual reviewers / contributors) for one or
two weeks

- Accept cross-domain mappings in any patch where the person subject to
the patch is ACKing the patch from the mapped-to (i.e. "current") email
address. This is now a *lot* easier to do, because the patch series is
structured by person.

- After one or two weeks, push all the patches that have been approved
like explained above.

- Repost the rest of the series, CC'd solely to the stewards. We will
then have to go through the backlog, and decide one by one whether, for
person X, the proposed mappings are cross-domain or not, and ACK or NACK
accordingly.

- Push the second round, drop the rest for good.

So in this first review iteration, we really depend on people to respond
from their "new" (mapped-to) addresses.

Fantastic job on the split-per-person!

Thanks!
Laszlo



Since I can not Cc all the recipients in this cover (107, MTA restricts
to 100), I'm documenting all patches individually.

- Another note regarding groups.io 40 posts per 30min limit -

My previous big series [5] involved 79 patches, and groups.io banned
me for some time after the 40th post. On [5] Laszlo suggested to test
the following git-send-email options to see if we can work with big
series and groups.io:

--batch-size=<num>
Some email servers (e.g. smtp.163.com) limit the number
emails to be sent per session (connection) and this will
lead to a failure when sending many messages. With this
option, send-email will disconnect after sending $<num>
messages and wait for a few seconds (see --relogin-delay)
and reconnect, to work around such a limit. You may want
to use some form of credential helper to avoid having to
retype your password every time this happens. Defaults to
the sendemail.smtpBatchSize configuration variable.

--relogin-delay=<int>
Waiting $<int> seconds before reconnecting to SMTP server.
Used together with --batch-size option. Defaults to the
sendemail.smtpReloginDelay configuration variable.

So I'm sending this series using git-publish [7] after setting the
following values:

$ git config sendemail.smtpBatchSize 33
$ git config sendemail.smtpReloginDelay 1848

Regards,

Phil.

[1] https://git-scm.com/docs/git-shortlog#_mapping_authors
[2] https://git-scm.com/docs/git-check-mailmap#_mapping_authors
[3] https://github.com/sympy/sympy/wiki/Using-.mailmap#making-mailmap-entries
[4] https://edk2.groups.io/g/devel/message/51657
[5] https://edk2.groups.io/g/devel/message/51606
[6] https://edk2.groups.io/g/devel/message/51761
[7] https://github.com/stefanha/git-publish

Cc: Andrew Fish <afish@apple.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Michael D Kinney <michael.d.kinney@intel.com>


Philippe Mathieu-Daudé (105):
.mailmap: Add a stub with documentation
.mailmap: Add an entry for Alexei Fedorov
.mailmap: Add an entry for Amy Chan
.mailmap: Add an entry for Andrew Fish
.mailmap: Add an entry for Antoine Cœur
.mailmap: Add an entry for Ard Biesheuvel
.mailmap: Add an entry for Ashley DeSimone
.mailmap: Add an entry for Ashraf Javeed
.mailmap: Add an entry for Baraneedharan Anbazhagan
.mailmap: Add an entry for Bob Feng
.mailmap: Add an entry for Brendan Jackman
.mailmap: Add an entry for Chao Zhang
.mailmap: Add an entry for Chasel Chiu
.mailmap: Add an entry for Chen A Chen
.mailmap: Add an entry for Cheng Ching Jen
.mailmap: Add an entry for Christian Rodriguez
.mailmap: Add an entry for Christopher J Zurcher
.mailmap: Add an entry for Dandan Bi
.mailmap: Add an entry for David Chan
.mailmap: Add an entry for David Wei
.mailmap: Add an entry for Derek Lin
.mailmap: Add an entry for Digant H Solanki
.mailmap: Add an entry for Eric Dong
.mailmap: Add an entry for Eric Jin
.mailmap: Add an entry for Erik Bjorge
.mailmap: Add an entry for Eugene Cohen
.mailmap: Add an entry for Feng Tian
.mailmap: Add an entry for Feng Yunhua
.mailmap: Add an entry for Guo Dong
.mailmap: Add an entry for Hao Wu
.mailmap: Add an entry for Harry Liebel
.mailmap: Add an entry for Herbie Robinson
.mailmap: Add an entry for Hess Chen
.mailmap: Add an entry for Hot Tian
.mailmap: Add an entry for Jaben Carsey
.mailmap: Add an entry for Jan Dabros
.mailmap: Add an entry for Jeff Bobzin
.mailmap: Add an entry for Jian J Wang
.mailmap: Add an entry for Jiaxin Wu
.mailmap: Add an entry for Jim Dailey
.mailmap: Add an entry for Jordan Justen
.mailmap: Add an entry for Ken Lu
.mailmap: Add an entry for Laszlo Ersek
.mailmap: Add an entry for Laurie Jarlstrom
.mailmap: Add an entry for Lee Rosenbaum
.mailmap: Add an entry for Leon Li
.mailmap: Add an entry for Liming Gao
.mailmap: Add an entry for Loh Tien Hock
.mailmap: Add an entry for Lubo Zhang
.mailmap: Add an entry for Lu Shifei
.mailmap: Add an entry for Maciej Rabeda
.mailmap: Add an entry for Maggie Chu
.mailmap: Add an entry for Marc-André Lureau
.mailmap: Add an entry for Marc W Chen
.mailmap: Add an entry for Marvin Häuser
.mailmap: Add an entry for Mateusz Albecki
.mailmap: Add an entry for Maurice Ma
.mailmap: Add an entry for Maxim Shvecov
.mailmap: Add an entry for Michael Johnson
.mailmap: Add an entry for Michael Kinney
.mailmap: Add an entry for Michael Kubacki
.mailmap: Add an entry for Michael Zimmermann
.mailmap: Add an entry for Mike Wu
.mailmap: Add an entry for Ming Tan
.mailmap: Add an entry for Nikolai Saoukh
.mailmap: Add an entry for Olivier Martin
.mailmap: Add an entry for Pedroa Liu
.mailmap: Add an entry for Penny Gao
.mailmap: Add an entry for Philippe Mathieu-Daudé
.mailmap: Add an entry for Qian Ouyang
.mailmap: Add an entry for Qing Huang
.mailmap: Add an entry for Qiu Shumin
.mailmap: Add an entry for Ray Ni
.mailmap: Add an entry for Rebecca Cran
.mailmap: Add an entry for Richard Thomaiyar
.mailmap: Add an entry for Rodrigo Gonzalez del Cueto
.mailmap: Add an entry for Ronald Cron
.mailmap: Add an entry for Rui Sun
.mailmap: Add an entry for Sachin Agrawal
.mailmap: Add an entry for Samer El-Haj-Mahmoud
.mailmap: Add an entry for Satya Yarlagadda
.mailmap: Add an entry for Sergey Isakov
.mailmap: Add an entry for Shenglei Zhang
.mailmap: Add an entry for Siyuan Fu
.mailmap: Add an entry for Songpeng Li
.mailmap: Add an entry for Sriram Subramanian
.mailmap: Add an entry for Star Zeng
.mailmap: Add an entry for Steven Shi
.mailmap: Add an entry for Ting Ye
.mailmap: Add an entry for Tomas Pilar
.mailmap: Add an entry for Vanguput Narendra
.mailmap: Add an entry for Vitaly Cheptsov
.mailmap: Add an entry for Vladimir Olovyannikov
.mailmap: Add an entry for Wang Fan
.mailmap: Add an entry for Wang Yu
.mailmap: Add an entry for Wei Xu
.mailmap: Add an entry for Xiaofeng Wang
.mailmap: Add an entry for Xiaoyu Lu
.mailmap: Add an entry for Xue Shengfeng
.mailmap: Add an entry for Yao Jiewen
.mailmap: Add an entry for Yeh Greg
.mailmap: Add an entry for Yingke Liu
.mailmap: Add an entry for Yonghong Zhu
.mailmap: Add an entry for Yu-Chen Lin
.mailmap: Add an entry for Zailiang Sun

.mailmap | 200 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 200 insertions(+)
create mode 100644 .mailmap

Join devel@edk2.groups.io to automatically receive all group messages.