Re: [PATCH] .mailmap: Reintroduce file to fix spelling and encoding issues

[Alejandro Colomar <alx@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 3536 bytes --]

On 2026-05-10T23:40:32+0200, Alejandro Colomar wrote:
> Hi Guillem!
> 
> On 2026-05-10T22:33:18+0200, Guillem Jover wrote:
> > Hi!
> > 
> > On Sun, 2026-05-10 at 20:53:01 +0200, Alejandro Colomar wrote:
> > > On 2026-05-10T19:22:04+0200, Guillem Jover wrote:
> > > > From: Guillem Jover <guillem@hadrons.org>
> > > > 
> > > > It make sense to use this file to fix spelling and encoding issues that
> > > > otherwise show up when checking the git history. It also makes sense to
> > > > honor name changes for people, to avoid dead naming or similar. As well
> > > > as fixing up local mail addresses that have never been valid.
> > > > 
> > > > It makes less sense to remap valid addresses at the time of submission
> > > > that represented a specific hat or organization, where the person is
> > > > no longer affiliated with, because that breaks the historic trail and
> > > > provenance of the changes. And is what require a continuous update
> > > > burden, which seems to have been the reason for the removal with
> > > > commit 2231a1659621d281a2fbb0d75bad5bccce538f96.
> > 
> > > Hmmm, to be honest, I don't know what to do with this patch.  I might or
> > > might not take it; I'm undecided.
> > 
> > > Out of curiosity, what were you looking at, that lead you to writing it?
> > > :)
> > 
> > I've had this change lost in a local branch for some time, and noticed
> > while going over pending changes for the recent submission. And found
> > about the file deletion during rebasing it.
> 
> Hmm.
> 
> > The original reason was the same as now, when doing things like:
> > 
> >   git rlog
> >     (alias for «log --format=format:\"%h %Cblue%ai%Creset %aN %Cgreen%s%Creset %C(auto,brightyellow)%(decorate)%Creset\"»)
> 
> (Off-topic:)
> Interesting.  This is similar to something I use.
> 
> 	git log \
> 	--format=format:"%C(auto)%h%C(reset) %C(dim white)(%cs;%Creset %C(blue)%aN;%C(reset) %C(dim white)\"%C(reset)%C(auto)%s%C(reset)%C(dim white)\")%C(reset) %d%C(reset)"

Oops, mistake at the end when pasting stuff.

	git log \
	--format=format:"%C(auto)%h%C(reset) %C(dim white)(%cs;%Creset %C(blue)%aN;%C(reset) %C(dim white)\"%C(reset)%C(auto)%s%C(reset)%C(dim white)\")%C(reset) %C(auto)%d%C(reset)"

> 
> >   git shortlog -s
> > 
> > Or other stuff involved history digging, you get wrongly encoded
> > output.
> 
> Oh, now I've seen some of those you patched, and indeed, they look
> like something we should fix.
> 
> > Assuming you have concerns about maintainability I think it would be
> > fair to state somewhere (either in the contributing docs, or perhaps
> > even in the .mailmap file) what are the acceptable entries there, to
> > mitigate that concern.
> 
> I'm now thinking I'll accept the patch.  I think typos in the name are
> uncommon, and so they won't require many changes to the file.
> 
> Would you mind separating the fixes for spelling issues, encoding
> issues, and name changes, into three separate commits?  I assume from
> the comment in your patch that there are no name changes in your patch.
> I think the comment should be removed, because it might seem as if name
> changes are not welcome.
> 
> Feel free to also add a patch to the series, adding
> CONTRIBUTING.d/mailmap, and documenting what's acceptable.  I agree with
> your criteria.
> 
> > 
> > Thanks,
> > Guillem
> 
> 
> Have a lovely night!
> Alex
> 
> -- 
> <https://www.alejandro-colomar.es>



-- 
<https://www.alejandro-colomar.es>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]