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

Philippe Mathieu-Daudé philmd at redhat.com
Fri Dec 6 14:11:58 UTC 2019


On 12/6/19 1:23 PM, Laszlo Ersek wrote:
> 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.

This works for me, thanks!

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


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

View/Reply Online (#51961): https://edk2.groups.io/g/devel/message/51961
Mute This Topic: https://groups.io/mt/67467659/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-





More information about the edk2-devel-archive mailing list