[ptxdist] [PATCH v2] mailmap: Add a few entries for improved commit statistics

[ptxdist] [PATCH v2] mailmap: Add a few entries for improved commit statistics

[Uwe Kleine-König]

When a single person uses different variants of their real name and
different email addresses, they appear as different persons in the
hall of fame in the category "Commits".

With this .mailmap the number of individual committers is reduced from
148 to 134 (as of ptxdist-2023.11.0) as produced by

        git shortlog -sn

.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

(implicit) v1 was sent with Message-Id:
<20230607135129.189660-1-u.kleine-koenig@pengutronix.de> based on
2023.05.0.

I added a few more entries pointed out by Alexander Dahl to merge some
more entries. I was unsure if I should really merge Jürgen Beisert and
Juergen Borleis. While this is only one person, his name actually
changed, so I'm hesitant to merge.

Best regards
Uwe

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000000..fb334866ce21
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+Andrej Gantvorg <andrej.gantvorg@wago.com>
+Bjørn Bürger <b.buerger@pengutronix.de>
+Christian Gieseler <cg@eks-engel.de>
+Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
+Denis Osterland-Heim <denis.osterland@diehl.com>
+Dennis Herbrich <kontakt+git@veloxis.de>
+Enrico Jorns <e.joerns@tu-bs.de>
+Enrico Jorns <ejo@pengutronix.de>
+Florian Bäuerle <florian.baeuerle@allegion.com>
+Guillermo Rodríguez <guille.rodriguez@gmail.com>
+Jürgen Beisert <j.beisert@pengutronix.de>
+Jürgen Beisert <jbe@pengutronix.de>
+Ladislav Michl <Ladislav.Michl@seznam.cz>
+Ladislav Michl <ladis@linux-mips.org>
+Michael Olbrich <mol@freebie.lab.pengutronix.de>
+Thorsten Liepert <thorsten.liepert@diehl.com>
-- 
2.42.0

Re: [ptxdist] [APPLIED] mailmap: Add a few entries for improved commit statistics

[Michael Olbrich]

Thanks, applied as c9fdf200f60cfd9c48991a5381f36e3b38631c0a.

Michael

[sent from post-receive hook]

On Fri, 10 Nov 2023 08:25:17 +0100, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> When a single person uses different variants of their real name and
> different email addresses, they appear as different persons in the
> hall of fame in the category "Commits".
> 
> With this .mailmap the number of individual committers is reduced from
> 148 to 134 (as of ptxdist-2023.11.0) as produced by
> 
>         git shortlog -sn
> 
> .
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20231103130246.3472274-2-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index 000000000000..fb334866ce21
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,16 @@
> +Andrej Gantvorg <andrej.gantvorg@wago.com>
> +Bjørn Bürger <b.buerger@pengutronix.de>
> +Christian Gieseler <cg@eks-engel.de>
> +Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
> +Denis Osterland-Heim <denis.osterland@diehl.com>
> +Dennis Herbrich <kontakt+git@veloxis.de>
> +Enrico Jorns <e.joerns@tu-bs.de>
> +Enrico Jorns <ejo@pengutronix.de>
> +Florian Bäuerle <florian.baeuerle@allegion.com>
> +Guillermo Rodríguez <guille.rodriguez@gmail.com>
> +Jürgen Beisert <j.beisert@pengutronix.de>
> +Jürgen Beisert <jbe@pengutronix.de>
> +Ladislav Michl <Ladislav.Michl@seznam.cz>
> +Ladislav Michl <ladis@linux-mips.org>
> +Michael Olbrich <mol@freebie.lab.pengutronix.de>
> +Thorsten Liepert <thorsten.liepert@diehl.com>

Re: [ptxdist] [PATCH v2] mailmap: Add a few entries for improved commit statistics

[Roland Hieber]

On Fri, Nov 03, 2023 at 02:02:47PM +0100, Uwe Kleine-König wrote:
> When a single person uses different variants of their real name and
> different email addresses, they appear as different persons in the
> hall of fame in the category "Commits".
> 
> With this .mailmap the number of individual committers is reduced from
> 148 to 134 (as of ptxdist-2023.11.0) as produced by
> 
>         git shortlog -sn
> 
> .
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
> 
> (implicit) v1 was sent with Message-Id:
> <20230607135129.189660-1-u.kleine-koenig@pengutronix.de> based on
> 2023.05.0.
> 
> I added a few more entries pointed out by Alexander Dahl to merge some
> more entries. I was unsure if I should really merge Jürgen Beisert and
> Juergen Borleis. While this is only one person, his name actually
> changed, so I'm hesitant to merge.
> 
> Best regards
> Uwe
> 
>  .mailmap | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>  create mode 100644 .mailmap
> 
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index 000000000000..fb334866ce21
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,16 @@
> +Andrej Gantvorg <andrej.gantvorg@wago.com>
> +Bjørn Bürger <b.buerger@pengutronix.de>
> +Christian Gieseler <cg@eks-engel.de>
> +Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
> +Denis Osterland-Heim <denis.osterland@diehl.com>
> +Dennis Herbrich <kontakt+git@veloxis.de>
> +Enrico Jorns <e.joerns@tu-bs.de>
> +Enrico Jorns <ejo@pengutronix.de>

Is there a reason besides oversight why you put the "wrong" name in the
file, so now Enrico is always credited as "Enrico Jorns" instead of
"Enrico Jörns"? (The syntax according to the gitmailmap man page is
"Proper Name <commit@email.xx>".)

Otherwise I would suggest the following patch:

diff --git a/.mailmap b/.mailmap
index fb334866ce21..f5f8dc7419a2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,12 +4,12 @@ Christian Gieseler <cg@eks-engel.de>
 Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
 Denis Osterland-Heim <denis.osterland@diehl.com>
 Dennis Herbrich <kontakt+git@veloxis.de>
-Enrico Jorns <e.joerns@tu-bs.de>
-Enrico Jorns <ejo@pengutronix.de>
+Enrico Jörns <e.joerns@tu-bs.de>
+Enrico Jörns <ejo@pengutronix.de>
 Florian Bäuerle <florian.baeuerle@allegion.com>
 Guillermo Rodríguez <guille.rodriguez@gmail.com>
-Jürgen Beisert <j.beisert@pengutronix.de>
-Jürgen Beisert <jbe@pengutronix.de>
+Jürgen Borleis <j.beisert@pengutronix.de>
+Jürgen Borleis <jbe@pengutronix.de>
 Ladislav Michl <Ladislav.Michl@seznam.cz>
 Ladislav Michl <ladis@linux-mips.org>
 Michael Olbrich <mol@freebie.lab.pengutronix.de>


 - Roland


> +Florian Bäuerle <florian.baeuerle@allegion.com>
> +Guillermo Rodríguez <guille.rodriguez@gmail.com>
> +Jürgen Beisert <j.beisert@pengutronix.de>
> +Jürgen Beisert <jbe@pengutronix.de>
> +Ladislav Michl <Ladislav.Michl@seznam.cz>
> +Ladislav Michl <ladis@linux-mips.org>
> +Michael Olbrich <mol@freebie.lab.pengutronix.de>
> +Thorsten Liepert <thorsten.liepert@diehl.com>
> -- 
> 2.42.0
> 
> 
> 

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH v2] mailmap: Add a few entries for improved commit statistics

[Uwe Kleine-König]

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

On Wed, Dec 13, 2023 at 07:30:47PM +0100, Roland Hieber wrote:
> On Fri, Nov 03, 2023 at 02:02:47PM +0100, Uwe Kleine-König wrote:
> > When a single person uses different variants of their real name and
> > different email addresses, they appear as different persons in the
> > hall of fame in the category "Commits".
> > 
> > With this .mailmap the number of individual committers is reduced from
> > 148 to 134 (as of ptxdist-2023.11.0) as produced by
> > 
> >         git shortlog -sn
> > 
> > .
> > 
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> > Hello,
> > 
> > (implicit) v1 was sent with Message-Id:
> > <20230607135129.189660-1-u.kleine-koenig@pengutronix.de> based on
> > 2023.05.0.
> > 
> > I added a few more entries pointed out by Alexander Dahl to merge some
> > more entries. I was unsure if I should really merge Jürgen Beisert and
> > Juergen Borleis. While this is only one person, his name actually
> > changed, so I'm hesitant to merge.
> > 
> > Best regards
> > Uwe
> > 
> >  .mailmap | 16 ++++++++++++++++
> >  1 file changed, 16 insertions(+)
> >  create mode 100644 .mailmap
> > 
> > diff --git a/.mailmap b/.mailmap
> > new file mode 100644
> > index 000000000000..fb334866ce21
> > --- /dev/null
> > +++ b/.mailmap
> > @@ -0,0 +1,16 @@
> > +Andrej Gantvorg <andrej.gantvorg@wago.com>
> > +Bjørn Bürger <b.buerger@pengutronix.de>
> > +Christian Gieseler <cg@eks-engel.de>
> > +Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
> > +Denis Osterland-Heim <denis.osterland@diehl.com>
> > +Dennis Herbrich <kontakt+git@veloxis.de>
> > +Enrico Jorns <e.joerns@tu-bs.de>
> > +Enrico Jorns <ejo@pengutronix.de>
> 
> Is there a reason besides oversight why you put the "wrong" name in the
> file, so now Enrico is always credited as "Enrico Jorns" instead of
> "Enrico Jörns"? (The syntax according to the gitmailmap man page is
> "Proper Name <commit@email.xx>".)

"Enrico Jorns" is the spelling that Enrico uses in his contributions
despite his official lastname being "Jörns". So I guess sticking to
"Jorns" is right.
 
> Otherwise I would suggest the following patch:
> 
> diff --git a/.mailmap b/.mailmap
> index fb334866ce21..f5f8dc7419a2 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -4,12 +4,12 @@ Christian Gieseler <cg@eks-engel.de>
>  Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
>  Denis Osterland-Heim <denis.osterland@diehl.com>
>  Dennis Herbrich <kontakt+git@veloxis.de>
> -Enrico Jorns <e.joerns@tu-bs.de>
> -Enrico Jorns <ejo@pengutronix.de>
> +Enrico Jörns <e.joerns@tu-bs.de>
> +Enrico Jörns <ejo@pengutronix.de>
>  Florian Bäuerle <florian.baeuerle@allegion.com>
>  Guillermo Rodríguez <guille.rodriguez@gmail.com>
> -Jürgen Beisert <j.beisert@pengutronix.de>
> -Jürgen Beisert <jbe@pengutronix.de>
> +Jürgen Borleis <j.beisert@pengutronix.de>
> +Jürgen Borleis <jbe@pengutronix.de>
>  Ladislav Michl <Ladislav.Michl@seznam.cz>
>  Ladislav Michl <ladis@linux-mips.org>
>  Michael Olbrich <mol@freebie.lab.pengutronix.de>

At the time these commits were created the lastname was Beisert. So even
knowing that Jürgen Borleis and Jürgen Beisert are the same guy, I
didn't adapt that on purpose.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

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

Re: [ptxdist] [PATCH v2] mailmap: Add a few entries for improved commit statistics

[Roland Hieber]

On Wed, Dec 13, 2023 at 07:40:34PM +0100, Uwe Kleine-König wrote:
> On Wed, Dec 13, 2023 at 07:30:47PM +0100, Roland Hieber wrote:
> > On Fri, Nov 03, 2023 at 02:02:47PM +0100, Uwe Kleine-König wrote:
> > > When a single person uses different variants of their real name and
> > > different email addresses, they appear as different persons in the
> > > hall of fame in the category "Commits".
> > > 
> > > With this .mailmap the number of individual committers is reduced from
> > > 148 to 134 (as of ptxdist-2023.11.0) as produced by
> > > 
> > >         git shortlog -sn
> > > 
> > > .
> > > 
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > > ---
> > > Hello,
> > > 
> > > (implicit) v1 was sent with Message-Id:
> > > <20230607135129.189660-1-u.kleine-koenig@pengutronix.de> based on
> > > 2023.05.0.
> > > 
> > > I added a few more entries pointed out by Alexander Dahl to merge some
> > > more entries. I was unsure if I should really merge Jürgen Beisert and
> > > Juergen Borleis. While this is only one person, his name actually
> > > changed, so I'm hesitant to merge.
> > > 
> > > Best regards
> > > Uwe
> > > 
> > >  .mailmap | 16 ++++++++++++++++
> > >  1 file changed, 16 insertions(+)
> > >  create mode 100644 .mailmap
> > > 
> > > diff --git a/.mailmap b/.mailmap
> > > new file mode 100644
> > > index 000000000000..fb334866ce21
> > > --- /dev/null
> > > +++ b/.mailmap
> > > @@ -0,0 +1,16 @@
> > > +Andrej Gantvorg <andrej.gantvorg@wago.com>
> > > +Bjørn Bürger <b.buerger@pengutronix.de>
> > > +Christian Gieseler <cg@eks-engel.de>
> > > +Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
> > > +Denis Osterland-Heim <denis.osterland@diehl.com>
> > > +Dennis Herbrich <kontakt+git@veloxis.de>
> > > +Enrico Jorns <e.joerns@tu-bs.de>
> > > +Enrico Jorns <ejo@pengutronix.de>
> > 
> > Is there a reason besides oversight why you put the "wrong" name in the
> > file, so now Enrico is always credited as "Enrico Jorns" instead of
> > "Enrico Jörns"? (The syntax according to the gitmailmap man page is
> > "Proper Name <commit@email.xx>".)
> 
> "Enrico Jorns" is the spelling that Enrico uses in his contributions
> despite his official lastname being "Jörns". So I guess sticking to
> "Jorns" is right.
>  
> > Otherwise I would suggest the following patch:
> > 
> > diff --git a/.mailmap b/.mailmap
> > index fb334866ce21..f5f8dc7419a2 100644
> > --- a/.mailmap
> > +++ b/.mailmap
> > @@ -4,12 +4,12 @@ Christian Gieseler <cg@eks-engel.de>
> >  Christoph Rüdiger <Christoph.Ruediger@thyssenkrupp.com>
> >  Denis Osterland-Heim <denis.osterland@diehl.com>
> >  Dennis Herbrich <kontakt+git@veloxis.de>
> > -Enrico Jorns <e.joerns@tu-bs.de>
> > -Enrico Jorns <ejo@pengutronix.de>
> > +Enrico Jörns <e.joerns@tu-bs.de>
> > +Enrico Jörns <ejo@pengutronix.de>
> >  Florian Bäuerle <florian.baeuerle@allegion.com>
> >  Guillermo Rodríguez <guille.rodriguez@gmail.com>
> > -Jürgen Beisert <j.beisert@pengutronix.de>
> > -Jürgen Beisert <jbe@pengutronix.de>
> > +Jürgen Borleis <j.beisert@pengutronix.de>
> > +Jürgen Borleis <jbe@pengutronix.de>
> >  Ladislav Michl <Ladislav.Michl@seznam.cz>
> >  Ladislav Michl <ladis@linux-mips.org>
> >  Michael Olbrich <mol@freebie.lab.pengutronix.de>
> 
> At the time these commits were created the lastname was Beisert. So even
> knowing that Jürgen Borleis and Jürgen Beisert are the same guy, I
> didn't adapt that on purpose.

But now all commits by Jürgen Borleis are credited to Jürgen Beisert,
which is equally wrong. Not sure this is what you indented?

 - Roland

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |