[edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history

Philippe Mathieu-Daudé posted 32 patches 4 years, 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/20200102192345.14600-1-philmd@redhat.com
There is a newer version of this series
.mailmap | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 .mailmap
[edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago
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.

This v3 collects the patches of the 30 developers who replied to
the v2 [5] with their R-b tag.  There is an exception with patch

I dropped the unreviewed patches and am cc'ing this series to the
Tianocore stewards, as suggested by Laszlo in [6]. Each developer
will still be Cc'ed in case a modification was requested, he/her
can verify.

This series is available at:
https://gitlab.com/philmd/edk2/commits/mailmap-v3

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/51834
[6] https://edk2.groups.io/g/devel/message/51906

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é (32):
  .mailmap: Add a stub with documentation
  .mailmap: Add an entry for Aaron Li
  .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 Baraneedharan Anbazhagan
  .mailmap: Add an entry for Chasel Chiu
  .mailmap: Add an entry for Christopher J Zurcher
  .mailmap: Add an entry for Eric Dong
  .mailmap: Add an entry for Erik Bjorge
  .mailmap: Add an entry for Hao Wu
  .mailmap: Add an entry for Hot Tian
  .mailmap: Add an entry for Jiewen Yao
  .mailmap: Add an entry for Jim Dailey
  .mailmap: Add an entry for Laszlo Ersek
  .mailmap: Add an entry for Liming Gao
  .mailmap: Add an entry for Maciej Rabeda
  .mailmap: Add an entry for Marc-André Lureau
  .mailmap: Add an entry for Marvin Häuser
  .mailmap: Add an entry for Maurice Ma
  .mailmap: Add an entry for Michael Kubacki
  .mailmap: Add an entry for Ming Tan
  .mailmap: Add an entry for Nikolai Saoukh
  .mailmap: Add an entry for Philippe Mathieu-Daudé
  .mailmap: Add an entry for Ray Ni
  .mailmap: Add an entry for Samer El-Haj-Mahmoud
  .mailmap: Add an entry for Shenglei Zhang
  .mailmap: Add an entry for Star Zeng
  .mailmap: Add an entry for Vitaly Cheptsov
  .mailmap: Add an entry for Vladimir Olovyannikov
  .mailmap: Add an entry for Yonghong Zhu
  .mailmap: Add an entry for Yu-Chen Lin

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

-- 
2.21.0


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52667): https://edk2.groups.io/g/devel/message/52667
Mute This Topic: https://groups.io/mt/69385958/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history
Posted by Laszlo Ersek 4 years, 3 months ago
On 01/02/20 20:23, 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.
> 
> This v3 collects the patches of the 30 developers who replied to
> the v2 [5] with their R-b tag.

OK. So am I correct to think that this sub-series is ready for merging?

>  There is an exception with patch

Hmmm... unfinished thought. :) Apparently, there is a patch that
prevents the series from being merged? Which one?

> I dropped the unreviewed patches and am cc'ing this series to the
> Tianocore stewards, as suggested by Laszlo in [6]. Each developer
> will still be Cc'ed in case a modification was requested, he/her
> can verify.

Ah, OK, so this is *not* the final version (for round 1, per [6]), just yet.

Can you please monitor the remaining feedback for this series? If
everyone is happy with the v3 updates, and you determine that the patch
set is fully reviewed, I can help pick up the new tags, and merge the
series.

Thanks!
Laszlo

> 
> This series is available at:
> https://gitlab.com/philmd/edk2/commits/mailmap-v3
> 
> 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/51834
> [6] https://edk2.groups.io/g/devel/message/51906
> 
> 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é (32):
>   .mailmap: Add a stub with documentation
>   .mailmap: Add an entry for Aaron Li
>   .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 Baraneedharan Anbazhagan
>   .mailmap: Add an entry for Chasel Chiu
>   .mailmap: Add an entry for Christopher J Zurcher
>   .mailmap: Add an entry for Eric Dong
>   .mailmap: Add an entry for Erik Bjorge
>   .mailmap: Add an entry for Hao Wu
>   .mailmap: Add an entry for Hot Tian
>   .mailmap: Add an entry for Jiewen Yao
>   .mailmap: Add an entry for Jim Dailey
>   .mailmap: Add an entry for Laszlo Ersek
>   .mailmap: Add an entry for Liming Gao
>   .mailmap: Add an entry for Maciej Rabeda
>   .mailmap: Add an entry for Marc-André Lureau
>   .mailmap: Add an entry for Marvin Häuser
>   .mailmap: Add an entry for Maurice Ma
>   .mailmap: Add an entry for Michael Kubacki
>   .mailmap: Add an entry for Ming Tan
>   .mailmap: Add an entry for Nikolai Saoukh
>   .mailmap: Add an entry for Philippe Mathieu-Daudé
>   .mailmap: Add an entry for Ray Ni
>   .mailmap: Add an entry for Samer El-Haj-Mahmoud
>   .mailmap: Add an entry for Shenglei Zhang
>   .mailmap: Add an entry for Star Zeng
>   .mailmap: Add an entry for Vitaly Cheptsov
>   .mailmap: Add an entry for Vladimir Olovyannikov
>   .mailmap: Add an entry for Yonghong Zhu
>   .mailmap: Add an entry for Yu-Chen Lin
> 
>  .mailmap | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 72 insertions(+)
>  create mode 100644 .mailmap
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52831): https://edk2.groups.io/g/devel/message/52831
Mute This Topic: https://groups.io/mt/69385958/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago
Hi Laszlo,

On 1/3/20 2:48 PM, Laszlo Ersek wrote:
> On 01/02/20 20:23, 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.
>>
>> This v3 collects the patches of the 30 developers who replied to
>> the v2 [5] with their R-b tag.
> 
> OK. So am I correct to think that this sub-series is ready for merging?
> 
>>   There is an exception with patch
> 
> Hmmm... unfinished thought. :) Apparently, there is a patch that
> prevents the series from being merged? Which one?

This comment was about patch 13/32, but Jiewen Yao already reviewed it, 
so this series is fully reviewed by each developer.

>> I dropped the unreviewed patches and am cc'ing this series to the
>> Tianocore stewards, as suggested by Laszlo in [6]. Each developer
>> will still be Cc'ed in case a modification was requested, he/her
>> can verify.
> 
> Ah, OK, so this is *not* the final version (for round 1, per [6]), just yet.
> 
> Can you please monitor the remaining feedback for this series? If
> everyone is happy with the v3 updates, and you determine that the patch
> set is fully reviewed, I can help pick up the new tags, and merge the
> series.

Since the change is a one-line, I'd prefer avoid respining the whole series.

IMHO the series is ready for step #4 "stewards 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" which I don't really get.
I suppose this will be resolved in the open on the mailing list, so 
individuals will get notified their patch got refused.

Thank for offering to pick and merge this series!

Phil.

>>
>> This series is available at:
>> https://gitlab.com/philmd/edk2/commits/mailmap-v3
>>
>> 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/51834
>> [6] https://edk2.groups.io/g/devel/message/51906
[...]


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52833): https://edk2.groups.io/g/devel/message/52833
Mute This Topic: https://groups.io/mt/69385958/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history
Posted by Laszlo Ersek 4 years, 3 months ago
On 01/03/20 14:56, Philippe Mathieu-Daudé wrote:
> On 1/3/20 2:48 PM, Laszlo Ersek wrote:

>> Apparently, there is a patch that
>> prevents the series from being merged? Which one?
>
> This comment was about patch 13/32, but Jiewen Yao already reviewed
> it,

OK, thanks.

> so this series is fully reviewed by each developer.

I've now tried applying this series locally (for a github.com pull
request). But git-am fails, on patch#6 ("corrupted patch").

I've checked the patch email (as saved from Thunderbird) and I can see
it uses quoted-printable transfer encoding. That has basically never
worked with edk2. Can you please send a v4, with 8-bit encoding?

Please see:

  [edk2-devel] [PATCH]
  BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py

  https://edk2.groups.io/g/devel/message/52323
  http://mid.mail-archive.com/02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com

>> Can you please monitor the remaining feedback for this series? If
>> everyone is happy with the v3 updates, and you determine that the
>> patch set is fully reviewed, I can help pick up the new tags, and
>> merge the series.
>
> Since the change is a one-line, I'd prefer avoid respining the whole
> series.

I think you mean the change is a one-liner *for a commit message*
(namely, Jiewen's R-b).

I would normally agree (I'd just pick up that R-b from the list), but
again, I can't apply the v3 patches in the first place.

> IMHO the series is ready for step #4 "stewards 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" which I don't really get.
> I suppose this will be resolved in the open on the mailing list, so
> individuals will get notified their patch got refused.

Let me quote the original suggestion in-line, from here:

  https://edk2.groups.io/g/devel/message/51906
  http://mid.mail-archive.com/9e212952-a114-57d0-9880-6686edc4d8ae@redhat.com

On 12/06/19 13:23, Laszlo Ersek wrote:
> - 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.

This is where we are now. We're about to push the patches with the
direct contributor approvals.

This covers 32 patches (v3) out of your original 105 (v2).

> - 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.

This is "step 4", and for that, you should please post the *rest* of the
patches: approximately 105-32 = 73 patches.

That is the "backlog". The idea is that the stewards should review
those, because we should be permitted to add email mappings even for
such contributors that do not personally comment on the proposed
mappings, as long as those mappings are not cross-domain.

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

And here the "rest" (to be dropped for good) stands for such patches
that even the stewards don't approve (because the mappings appear
cross-domain, which cannot be approved without direct contributor
feedback).

Thanks!
Laszlo


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52891): https://edk2.groups.io/g/devel/message/52891
Mute This Topic: https://groups.io/mt/69385958/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH v3 00/32] .mailmap: Add mailmap file to have a cleaner git history
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago
On 1/6/20 11:41 AM, Laszlo Ersek wrote:
> On 01/03/20 14:56, Philippe Mathieu-Daudé wrote:
>> On 1/3/20 2:48 PM, Laszlo Ersek wrote:
> 
>>> Apparently, there is a patch that
>>> prevents the series from being merged? Which one?
>>
>> This comment was about patch 13/32, but Jiewen Yao already reviewed
>> it,
> 
> OK, thanks.
> 
>> so this series is fully reviewed by each developer.
> 
> I've now tried applying this series locally (for a github.com pull
> request). But git-am fails, on patch#6 ("corrupted patch").
> 
> I've checked the patch email (as saved from Thunderbird) and I can see
> it uses quoted-printable transfer encoding. That has basically never
> worked with edk2. Can you please send a v4, with 8-bit encoding?
> 
> Please see:
> 
>    [edk2-devel] [PATCH]
>    BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
> 
>    https://edk2.groups.io/g/devel/message/52323
>    http://mid.mail-archive.com/02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com

Ah yes, I enabled this setting globally, but not in my edk2 identity 
(which is the one I use to avoid utf8 in my last name, which is the 
single community with UTF-8 issues I've to deal with).

    --identity=<identity>

      A configuration identity. When given, causes values
      in the sendemail.<identity> subsection to take
      precedence over values in the sendemail section. The
      default identity is the value of sendemail.identity.

I now fixed my config with:

$ git config --global sendemail.edk2.transferEncoding 8-bit

(btw I'm unable to apply the previously referred patch).

>>> Can you please monitor the remaining feedback for this series? If
>>> everyone is happy with the v3 updates, and you determine that the
>>> patch set is fully reviewed, I can help pick up the new tags, and
>>> merge the series.
>>
>> Since the change is a one-line, I'd prefer avoid respining the whole
>> series.
> 
> I think you mean the change is a one-liner *for a commit message*
> (namely, Jiewen's R-b).
> 
> I would normally agree (I'd just pick up that R-b from the list), but
> again, I can't apply the v3 patches in the first place.

Fair enough.

>> IMHO the series is ready for step #4 "stewards 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" which I don't really get.
>> I suppose this will be resolved in the open on the mailing list, so
>> individuals will get notified their patch got refused.
> 
> Let me quote the original suggestion in-line, from here:
> 
>    https://edk2.groups.io/g/devel/message/51906
>    http://mid.mail-archive.com/9e212952-a114-57d0-9880-6686edc4d8ae@redhat.com
> 
> On 12/06/19 13:23, Laszlo Ersek wrote:
>> - 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.
> 
> This is where we are now. We're about to push the patches with the
> direct contributor approvals.
> 
> This covers 32 patches (v3) out of your original 105 (v2).
> 
>> - 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.
> 
> This is "step 4", and for that, you should please post the *rest* of the
> patches: approximately 105-32 = 73 patches.
> 
> That is the "backlog". The idea is that the stewards should review
> those, because we should be permitted to add email mappings even for
> such contributors that do not personally comment on the proposed
> mappings, as long as those mappings are not cross-domain.

OK, understood now :)

Another way can be to not fix broken/obsolete emails, but fix author names.

>>
>> - Push the second round, drop the rest for good.
> 
> And here the "rest" (to be dropped for good) stands for such patches
> that even the stewards don't approve (because the mappings appear
> cross-domain, which cannot be approved without direct contributor
> feedback).
> 
> Thanks!
> Laszlo
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#52893): https://edk2.groups.io/g/devel/message/52893
Mute This Topic: https://groups.io/mt/69385958/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-