[PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities

Denis V. Lunev via Devel posted 1 patch 1 week, 2 days ago
Failed in applying to current master (apply log)
.mailmap | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
[PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Denis V. Lunev via Devel 1 week, 2 days ago
The devel@lists.libvirt.org mailing list rewrites the From: header
for DMARC reasons, so patches submitted via the list land in git as
'<Real Name> via Devel <devel@lists.libvirt.org>'. This currently
affects 29 commits across 12 distinct contributors, all of whom are
identifiable by their Signed-off-by trailer.

Add mailmap entries that remap each mangled identity back to the
author's real name and address, matching the approach used by the
Linux kernel for the same problem.

Beyond cosmetic cleanup, this keeps contribution statistics
(git shortlog, contributor graphs) accurate and ensures contributors
get proper credit for their work, which is valuable when they look
for new positions or otherwise need a verifiable record of upstream
activity.

This approach is standard for such situations in Linux kernel. I have
seen this several times.

Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 .mailmap | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/.mailmap b/.mailmap
index 24a2782144..81dc234c38 100644
--- a/.mailmap
+++ b/.mailmap
@@ -80,3 +80,21 @@ Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
 Michal Prívozník <mprivozn@redhat.com>
 Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
 Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>
+
+# Mailing list 'via Devel' From-munging:
+# devel@lists.libvirt.org rewrites the From: header for DMARC reasons,
+# producing commits attributed to '<Real Name> via Devel <devel@lists.libvirt.org>'.
+# Map each such mangled identity back to the author's real address taken
+# from their Signed-off-by trailer.
+Achill Gilgenast <achill@achill.org> Achill Gilgenast via Devel <devel@lists.libvirt.org>
+Akash Kulhalli <akash.kulhalli@oracle.com> Akash Kulhalli via Devel <devel@lists.libvirt.org>
+Enrique Llorente <ellorent@redhat.com> Enrique Llorente via Devel <devel@lists.libvirt.org>
+Han Han <hhan@redhat.com> Han Han via Devel <devel@lists.libvirt.org>
+Jim Fehlig <jfehlig@suse.com> Jim Fehlig via Devel <devel@lists.libvirt.org>
+Kirill Shchetiniuk <kshcheti@redhat.com> Kirill Shchetiniuk via Devel <devel@lists.libvirt.org>
+Miroslav Los <mirlos@cisco.com> Miroslav Los via Devel <devel@lists.libvirt.org>
+Nathan Chen <nathanc@nvidia.com> Nathan Chen via Devel <devel@lists.libvirt.org>
+Nikolai Barybin <nikolai.barybin@virtuozzo.com> Nikolai Barybin via Devel <devel@lists.libvirt.org>
+Srihari Parimi <sparimi@redhat.com> Srihari Parimi via Devel <devel@lists.libvirt.org>
+Surya Gupta <surygupt@redhat.com> Surya Gupta via Devel <devel@lists.libvirt.org>
+Wesley Hershberger <wesley.hershberger@canonical.com> Wesley Hershberger via Devel <devel@lists.libvirt.org>
-- 
2.51.0

Re: [PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Peter Krempa via Devel 3 days, 6 hours ago
On Wed, May 20, 2026 at 18:47:44 +0200, Denis V. Lunev wrote:
> The devel@lists.libvirt.org mailing list rewrites the From: header
> for DMARC reasons, so patches submitted via the list land in git as
> '<Real Name> via Devel <devel@lists.libvirt.org>'. This currently
> affects 29 commits across 12 distinct contributors, all of whom are
> identifiable by their Signed-off-by trailer.
> 
> Add mailmap entries that remap each mangled identity back to the
> author's real name and address, matching the approach used by the
> Linux kernel for the same problem.
> 
> Beyond cosmetic cleanup, this keeps contribution statistics
> (git shortlog, contributor graphs) accurate and ensures contributors
> get proper credit for their work, which is valuable when they look
> for new positions or otherwise need a verifiable record of upstream
> activity.
> 
> This approach is standard for such situations in Linux kernel. I have
> seen this several times.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> ---
>  .mailmap | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/.mailmap b/.mailmap
> index 24a2782144..81dc234c38 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -80,3 +80,21 @@ Daniel P. Berrangé <berrange@redhat.com> <dan@berrange.com>
>  Michal Prívozník <mprivozn@redhat.com>
>  Michal Prívozník <mprivozn@redhat.com> <miso.privoznik@gmail.com>
>  Marco Bozzolan <bozzolan@gmail.com> <redshift@gmx.com>
> +
> +# Mailing list 'via Devel' From-munging:
> +# devel@lists.libvirt.org rewrites the From: header for DMARC reasons,
> +# producing commits attributed to '<Real Name> via Devel <devel@lists.libvirt.org>'.
> +# Map each such mangled identity back to the author's real address taken
> +# from their Signed-off-by trailer.
> +Achill Gilgenast <achill@achill.org> Achill Gilgenast via Devel <devel@lists.libvirt.org>
> +Akash Kulhalli <akash.kulhalli@oracle.com> Akash Kulhalli via Devel <devel@lists.libvirt.org>
> +Enrique Llorente <ellorent@redhat.com> Enrique Llorente via Devel <devel@lists.libvirt.org>
> +Han Han <hhan@redhat.com> Han Han via Devel <devel@lists.libvirt.org>
> +Jim Fehlig <jfehlig@suse.com> Jim Fehlig via Devel <devel@lists.libvirt.org>
> +Kirill Shchetiniuk <kshcheti@redhat.com> Kirill Shchetiniuk via Devel <devel@lists.libvirt.org>
> +Miroslav Los <mirlos@cisco.com> Miroslav Los via Devel <devel@lists.libvirt.org>
> +Nathan Chen <nathanc@nvidia.com> Nathan Chen via Devel <devel@lists.libvirt.org>
> +Nikolai Barybin <nikolai.barybin@virtuozzo.com> Nikolai Barybin via Devel <devel@lists.libvirt.org>
> +Srihari Parimi <sparimi@redhat.com> Srihari Parimi via Devel <devel@lists.libvirt.org>
> +Surya Gupta <surygupt@redhat.com> Surya Gupta via Devel <devel@lists.libvirt.org>
> +Wesley Hershberger <wesley.hershberger@canonical.com> Wesley Hershberger via Devel <devel@lists.libvirt.org>

Sigh ... I've meanwhile managed to introduce one more:

+Radoslaw Smigielski <rsmigiel@redhat.com> Radoslaw Smigielski via Devel <devel@lists.libvirt.org>

I'll add it to the patch before pushing and update the count;

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Re: [PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Peter Krempa via Devel 3 days, 5 hours ago
On Wed, May 27, 2026 at 09:55:58 +0200, Peter Krempa via Devel wrote:
> On Wed, May 20, 2026 at 18:47:44 +0200, Denis V. Lunev wrote:

[...]

> 
> Sigh ... I've meanwhile managed to introduce one more:
> 
> +Radoslaw Smigielski <rsmigiel@redhat.com> Radoslaw Smigielski via Devel <devel@lists.libvirt.org>
> 
> I'll add it to the patch before pushing and update the count;

I've also installed a post-applypatch script for me so that I don't mess
up. I suggest for anyone reviewing upstream patches to do something
similar.

$ cat .git/hooks/post-applypatch
#!/bin/bash
if [ "$(git show --no-patch --pretty='format:%ae')" == 'devel@lists.libvirt.org' ]; then
    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
    echo '!                                                             !'
    echo '!      ERROR: munged email address in "Author" field          !'
    echo '!                                                             !'
    echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
fi
Re: [PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Jiri Denemark via Devel 3 days, 1 hour ago
On Wed, May 27, 2026 at 11:05:02 +0200, Peter Krempa wrote:
> On Wed, May 27, 2026 at 09:55:58 +0200, Peter Krempa via Devel wrote:
> > On Wed, May 20, 2026 at 18:47:44 +0200, Denis V. Lunev wrote:
> 
> [...]
> 
> > 
> > Sigh ... I've meanwhile managed to introduce one more:
> > 
> > +Radoslaw Smigielski <rsmigiel@redhat.com> Radoslaw Smigielski via Devel <devel@lists.libvirt.org>
> > 
> > I'll add it to the patch before pushing and update the count;
> 
> I've also installed a post-applypatch script for me so that I don't mess
> up. I suggest for anyone reviewing upstream patches to do something
> similar.
> 
> $ cat .git/hooks/post-applypatch
> #!/bin/bash
> if [ "$(git show --no-patch --pretty='format:%ae')" == 'devel@lists.libvirt.org' ]; then
>     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
>     echo '!                                                             !'
>     echo '!      ERROR: munged email address in "Author" field          !'
>     echo '!                                                             !'
>     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
> fi

Can't this be done as a push hook? Similarly to how we forbid pushing
without a signed-off-by tag.

Jirka
Re: [PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Peter Krempa via Devel 3 days, 1 hour ago
On Wed, May 27, 2026 at 15:04:30 +0200, Jiri Denemark wrote:
> On Wed, May 27, 2026 at 11:05:02 +0200, Peter Krempa wrote:
> > On Wed, May 27, 2026 at 09:55:58 +0200, Peter Krempa via Devel wrote:
> > > On Wed, May 20, 2026 at 18:47:44 +0200, Denis V. Lunev wrote:
> > 
> > [...]
> > 
> > > 
> > > Sigh ... I've meanwhile managed to introduce one more:
> > > 
> > > +Radoslaw Smigielski <rsmigiel@redhat.com> Radoslaw Smigielski via Devel <devel@lists.libvirt.org>
> > > 
> > > I'll add it to the patch before pushing and update the count;
> > 
> > I've also installed a post-applypatch script for me so that I don't mess
> > up. I suggest for anyone reviewing upstream patches to do something
> > similar.
> > 
> > $ cat .git/hooks/post-applypatch
> > #!/bin/bash
> > if [ "$(git show --no-patch --pretty='format:%ae')" == 'devel@lists.libvirt.org' ]; then
> >     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
> >     echo '!                                                             !'
> >     echo '!      ERROR: munged email address in "Author" field          !'
> >     echo '!                                                             !'
> >     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
> > fi
> 
> Can't this be done as a push hook? Similarly to how we forbid pushing
> without a signed-off-by tag.

Hmm, I wanted to say that it's not possible because the DCO requirement
is a checkbox in gitlab's UI, but I've noticed now that gitlab's branch
rules now have:

 Commit author's email

  [input box]

 All commit author's email must match this regular expression. If empty, any email is allowed. 

So ... with a proper regex it should be possible to reject
'devel@lists.libvirt.org'. I'll try it on a private branch first though
...
Re: [PATCH] mailmap: Map 'via Devel' mailing-list From-munged authors to real identities
Posted by Peter Krempa via Devel 2 days, 5 hours ago
On Wed, May 27, 2026 at 15:09:21 +0200, Peter Krempa via Devel wrote:
> On Wed, May 27, 2026 at 15:04:30 +0200, Jiri Denemark wrote:
> > On Wed, May 27, 2026 at 11:05:02 +0200, Peter Krempa wrote:
> > > On Wed, May 27, 2026 at 09:55:58 +0200, Peter Krempa via Devel wrote:
> > > > On Wed, May 20, 2026 at 18:47:44 +0200, Denis V. Lunev wrote:
> > > 
> > > [...]
> > > 
> > > > 
> > > > Sigh ... I've meanwhile managed to introduce one more:
> > > > 
> > > > +Radoslaw Smigielski <rsmigiel@redhat.com> Radoslaw Smigielski via Devel <devel@lists.libvirt.org>
> > > > 
> > > > I'll add it to the patch before pushing and update the count;
> > > 
> > > I've also installed a post-applypatch script for me so that I don't mess
> > > up. I suggest for anyone reviewing upstream patches to do something
> > > similar.
> > > 
> > > $ cat .git/hooks/post-applypatch
> > > #!/bin/bash
> > > if [ "$(git show --no-patch --pretty='format:%ae')" == 'devel@lists.libvirt.org' ]; then
> > >     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
> > >     echo '!                                                             !'
> > >     echo '!      ERROR: munged email address in "Author" field          !'
> > >     echo '!                                                             !'
> > >     echo '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
> > > fi
> > 
> > Can't this be done as a push hook? Similarly to how we forbid pushing
> > without a signed-off-by tag.
> 
> Hmm, I wanted to say that it's not possible because the DCO requirement
> is a checkbox in gitlab's UI, but I've noticed now that gitlab's branch
> rules now have:
> 
>  Commit author's email
> 
>   [input box]
> 
>  All commit author's email must match this regular expression. If empty, any email is allowed. 
> 
> So ... with a proper regex it should be possible to reject
> 'devel@lists.libvirt.org'. I'll try it on a private branch first though
> ...

So I had a closer look. Gitlab uses google's RE2 regex engine, which
doesn't support negative lookahead. So creating a regex, which rejects a
certain string is possible but extremely disgusting.

Definitely not something I'd be willing to want to touch and so I'm not
going to be putting it into the branch rule.

Maintainers can use a hook and that, given the other option, is much
more sensible.