On Thu, Jan 16, 2020 at 19:54:43 +0100, Philippe Mathieu-Daudé wrote: > > Phil, would it make sense for us to ask Leif to post an update to > > ".mailmap"? > > > > For example, what happens if we run "git shortlog" over a period that > > contains patches authored by *both* of Leif's email addresses? Would > > those entries be merged into a single block? Would such a merging be > > desirable (that's for Leif to decide / propose)? > > One use of .mailmap is to clean/unify the NAME part. > In this case Leif isn't affected because his NAME is the same. > > The other use is to redirect email when a user switch email. When > fixing/referring old commit, some email tools might take the old commit > author/committer. In this case .mailmap helps. I think it is desirable in > Leif particular case.
The question is *why* we use the mailmap to begin with. It is not clear to me that there was an understanding at the point .mailmap was added that the intent was to provide a mapping of people to current email addresses in perpetuity. Indeed, the initial commit message says: "The .mailmap git feature helps fixing commit mistakes (in name/email)." The comment header in the file itself says: # This list is used by git-shortlog to fix a few botched name translations # in the git archive, either because the author's full name was messed up # and/or not always written the same way, making contributions from the # same person appearing not to be so or badly displayed. Now, I'm not saying that providing a way to track individuals across employments, acquisitions, or other transitions is a bad idea. And using the .mailmap is a workable way of doing this, since it needs to be manually invoked outside of shortlog (it could be disastrous if it didn't, or the default git behaviour changes in the future). *But* before we start treating it in this way, I would like to see the intended use of .mailmap documented (in the tree), and that change reviewed by at least a couple of stewards and enough others to be able to say we have a consensus. If we do, I have no objections to the below patch being added at that point - but from my viewpoint, doing it before then would mean an unreviewed change to the process as some people understood when the file was first added. Best Regards, Leif > If he agrees the maintainer pushing his patch can amend this snippet: > > -- >8 -- > diff --git a/.mailmap b/.mailmap > index ae179b0886c7..bbf3052aa3aa 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -37,6 +37,7 @@ Jim Dailey <jim.dai...@dell.com> > Jim Dailey <jim.dai...@dell.com> <jim_dai...@dell.com> > Laszlo Ersek <ler...@redhat.com> > <lersek@6f19259b-4bc3-4df7-8a09-765794883524> > Laszlo Ersek <ler...@redhat.com> <lersek@Edk2> > +Leif Lindholm <l...@nuviainc.com> <leif.lindh...@linaro.org> > Liming Gao <liming....@intel.com> <Gao, Liming liming....@intel.com> > Liming Gao <liming....@intel.com> > <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> > Liming Gao <liming....@intel.com> <lgao4@Edk2> > --- > > Note he stays close to you and Liming ;) > > > > > Right now, Leif is not listed in ".mailmap" -- probably because there is > > exactly one email address associated with his authorship, all across the > > project history. But that's what's changing now, isn't it? > > > > Thanks, > > Laszlo > > > > > > > > > diff --git a/Maintainers.txt b/Maintainers.txt > > > index 146d8aca93f0..ca9da2892534 100644 > > > --- a/Maintainers.txt > > > +++ b/Maintainers.txt > > > @@ -70,7 +70,7 @@ Tianocore Stewards > > > F: * > > > M: Andrew Fish <af...@apple.com> > > > M: Laszlo Ersek <ler...@redhat.com> > > > -M: Leif Lindholm <leif.lindh...@linaro.org> > > > +M: Leif Lindholm <l...@nuviainc.com> > > > M: Michael D Kinney <michael.d.kin...@intel.com> > > > Responsible Disclosure, Reporting Security Issues > > > @@ -87,7 +87,7 @@ UEFI Shell Binaries (ShellBinPkg.zip) from EDK II > > > Releases: > > > W: https://github.com/tianocore/edk2/releases/ > > > M: Ray Ni <ray...@intel.com> (Ia32/X64) > > > M: Zhichao Gao <zhichao....@intel.com> (Ia32/X64) > > > -M: Leif Lindholm <leif.lindh...@linaro.org> (ARM/AArch64) > > > +M: Leif Lindholm <l...@nuviainc.com> (ARM/AArch64) > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> (ARM/AArch64) > > > EDK II Architectures: > > > @@ -95,7 +95,7 @@ EDK II Architectures: > > > ARM, AARCH64 > > > F: */AArch64/ > > > F: */Arm/ > > > -M: Leif Lindholm <leif.lindh...@linaro.org> > > > +M: Leif Lindholm <l...@nuviainc.com> > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> > > > EDK II Continuous Integration: > > > @@ -126,13 +126,13 @@ EDK II Packages: > > > ArmPkg > > > F: ArmPkg/ > > > W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPkg > > > -M: Leif Lindholm <leif.lindh...@linaro.org> > > > +M: Leif Lindholm <l...@nuviainc.com> > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> > > > ArmPlatformPkg > > > F: ArmPlatformPkg/ > > > W: https://github.com/tianocore/tianocore.github.io/wiki/ArmPlatformPkg > > > -M: Leif Lindholm <leif.lindh...@linaro.org> > > > +M: Leif Lindholm <l...@nuviainc.com> > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> > > > ArmVirtPkg > > > @@ -140,7 +140,7 @@ F: ArmVirtPkg/ > > > W: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg > > > M: Laszlo Ersek <ler...@redhat.com> > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> > > > -R: Leif Lindholm <leif.lindh...@linaro.org> > > > +R: Leif Lindholm <l...@nuviainc.com> > > > ArmVirtPkg: modules used on Xen > > > F: ArmVirtPkg/ArmVirtXen.* > > > @@ -173,7 +173,7 @@ M: Alexei Fedorov <alexei.fedo...@arm.com> > > > EmbeddedPkg > > > F: EmbeddedPkg/ > > > W: https://github.com/tianocore/tianocore.github.io/wiki/EmbeddedPkg > > > -M: Leif Lindholm <leif.lindh...@linaro.org> > > > +M: Leif Lindholm <l...@nuviainc.com> > > > M: Ard Biesheuvel <ard.biesheu...@linaro.org> > > > EmulatorPkg > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#53327): https://edk2.groups.io/g/devel/message/53327 Mute This Topic: https://groups.io/mt/69696909/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
