Cleaning up log messages

I was playing around with git log for the kernel and observed that
there is a lot of noise when trying to do statistics on the number of
commits.

For example:

Author: Greg K-H [off-list ref]
Author: Greg KH [off-list ref]
Author: Greg KH [off-list ref]
Author: Greg KH <greg@press.(none)>
Author: gregkh@suse.de [off-list ref]
Author: Greg Kroah-Hartman <gregkh@suse>
Author: Greg Kroah-Hartman [off-list ref]
Author: Greg Kroah-Hartman [off-list ref]

I don't see an obvious way to do this with git, but it would be neat
to have a 'clean' option on git log that would take each email address
(author, signed-off, acked, etc) and map it through a table which
would convert old email addresses in to the current one and also
standardize the formatting of the names. A cleaned log would be
altered on display, but just don't clean it if you want the original.

Of course this initial map would need to be built by hand. New commits
could be checked against the map and the mapped updated if the person
really has a new email address. Checking new commits against the map
would help clean things up going forward. checkpatch.pl could also
validate against the mapping file.

No pressing need to for this, it would just be a nice toy.

-- 
Jon Smirl
jonsmirl@gmail.com

Hi,

On Sun, 27 Jul 2008, Jon Smirl wrote:

I was playing around with git log for the kernel and observed that there 
is a lot of noise when trying to do statistics on the number of commits.

For example:

Author: Greg K-H [off-list ref]
Author: Greg KH [off-list ref]
Author: Greg KH [off-list ref]
Author: Greg KH <greg@press.(none)>
Author: gregkh@suse.de [off-list ref]
Author: Greg Kroah-Hartman <gregkh@suse>
Author: Greg Kroah-Hartman [off-list ref]
Author: Greg Kroah-Hartman [off-list ref]

I don't see an obvious way to do this with git, but it would be neat
to have a 'clean' option on git log that would take each email address
(author, signed-off, acked, etc) and map it through a table which
would convert old email addresses in to the current one and also
standardize the formatting of the names.

Something like .mailmap?

And to show the mapped author name instead of the committed one, you would 
use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)

Ciao,
Dscho

On 7/27/08, Johannes Schindelin [off-list ref] wrote:

Hi,


 On Sun, 27 Jul 2008, Jon Smirl wrote:

 > I was playing around with git log for the kernel and observed that there
 > is a lot of noise when trying to do statistics on the number of commits.
 >
 > For example:
 >
 > Author: Greg K-H [off-list ref]
 > Author: Greg KH [off-list ref]
 > Author: Greg KH [off-list ref]
 > Author: Greg KH <greg@press.(none)>
 > Author: gregkh@suse.de [off-list ref]
 > Author: Greg Kroah-Hartman <gregkh@suse>
 > Author: Greg Kroah-Hartman [off-list ref]
 > Author: Greg Kroah-Hartman [off-list ref]
 >
 > I don't see an obvious way to do this with git, but it would be neat
 > to have a 'clean' option on git log that would take each email address
 > (author, signed-off, acked, etc) and map it through a table which
 > would convert old email addresses in to the current one and also
 > standardize the formatting of the names.


Something like .mailmap?

 And to show the mapped author name instead of the committed one, you would
 use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)

So we can already do this? Where is a .mailmap for the kernel tree?

-- 
Jon Smirl
jonsmirl@gmail.com

On Sun, Jul 27, 2008 at 02:16:30PM -0400, Jon Smirl wrote:

On 7/27/08, Johannes Schindelin [off-list ref] wrote:

quoted

Something like .mailmap?

 And to show the mapped author name instead of the committed one, you would
 use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)

So we can already do this? Where is a .mailmap for the kernel tree?

	http://repo.or.cz/w/linux-2.6.git?a=blob;f=.mailmap

...right there. :-)

				Petr "Pasky" Baudis

On 7/27/08, Petr Baudis [off-list ref] wrote:

On Sun, Jul 27, 2008 at 02:16:30PM -0400, Jon Smirl wrote:
 > On 7/27/08, Johannes Schindelin [off-list ref] wrote:

quoted

quoted

Something like .mailmap?

 > >
 > >  And to show the mapped author name instead of the committed one, you would
 > >  use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)
 >
 > So we can already do this? Where is a .mailmap for the kernel tree?


        http://repo.or.cz/w/linux-2.6.git?a=blob;f=.mailmap

 ...right there. :-)

I updated to 1.6.0-rc0 and this is working. mailmap needs some
cleanup. Errors are still in the list, but this is a lot better than
it was. That made about 800 'contributors' disappear.

Is there a way to do short log and have it map the names? What about
replacing the emails with their current email address?

Random missing entries....
Greg KH
Greg Kroah-Hartman

Hans J Koch
Hans J. Koch

Jean-Christophe Dubois
Jean-Christophe DUBOIS

Miguel Boton
Miguel Botón

-- 
Jon Smirl
jonsmirl@gmail.com

Hi,

On Sun, 27 Jul 2008, Jon Smirl wrote:

On 7/27/08, Petr Baudis [off-list ref] wrote:

quoted

On Sun, Jul 27, 2008 at 02:16:30PM -0400, Jon Smirl wrote:
 > On 7/27/08, Johannes Schindelin [off-list ref] wrote:

quoted

quoted

Something like .mailmap?

 > >
 > >  And to show the mapped author name instead of the committed one, you would
 > >  use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)
 >
 > So we can already do this? Where is a .mailmap for the kernel tree?

        http://repo.or.cz/w/linux-2.6.git?a=blob;f=.mailmap

 ...right there. :-)

I updated to 1.6.0-rc0 and this is working. mailmap needs some
cleanup. Errors are still in the list, but this is a lot better than
it was. That made about 800 'contributors' disappear.

Is there a way to do short log and have it map the names?

Yes, as of v1.6.0-rc0~58 you can pass --pretty=format: to shortlog.

What about replacing the emails with their current email address?

Nope, that was never meant to be done.

Ciao,
Dscho

On 7/27/08, Johannes Schindelin [off-list ref] wrote:

Hi,


 On Sun, 27 Jul 2008, Jon Smirl wrote:

 > On 7/27/08, Petr Baudis [off-list ref] wrote:
 > > On Sun, Jul 27, 2008 at 02:16:30PM -0400, Jon Smirl wrote:
 > >  > On 7/27/08, Johannes Schindelin [off-list ref] wrote:
 > >
 > > > > Something like .mailmap?
 > >  > >
 > >  > >  And to show the mapped author name instead of the committed one, you would
 > >  > >  use "--pretty=format:%aN"?  (Needs 1.6.0-rc0 at least, IIRC)
 > >  >
 > >  > So we can already do this? Where is a .mailmap for the kernel tree?
 > >
 > >         http://repo.or.cz/w/linux-2.6.git?a=blob;f=.mailmap
 > >
 > >  ...right there. :-)
 >
 > I updated to 1.6.0-rc0 and this is working. mailmap needs some
 > cleanup. Errors are still in the list, but this is a lot better than
 > it was. That made about 800 'contributors' disappear.
 >
 > Is there a way to do short log and have it map the names?


Yes, as of v1.6.0-rc0~58 you can pass --pretty=format: to shortlog.

How do you do it with git log? --pretty overrides the default of medium

--pretty[=<format>]

    Pretty-print the contents of the commit logs in a given format,
where <format> can be one of oneline, short, medium, full, fuller,
email, raw and format:<string>. When omitted, the format defaults to
medium.

 > What about replacing the emails with their current email address?


Nope, that was never meant to be done.

 Ciao,
 Dscho

-- 
Jon Smirl
jonsmirl@gmail.com

Hi,

On Sun, 27 Jul 2008, Jon Smirl wrote:

How do you do it with git log? --pretty overrides the default of medium

--pretty[=<format>]

    Pretty-print the contents of the commit logs in a given format,
where <format> can be one of oneline, short, medium, full, fuller,
email, raw and format:<string>. When omitted, the format defaults to
medium.

You get it _almost_ with

$ f='commit %H%nAuthor: %aN <%ae>%nDate:    %ad%n%n%s%n%n%b'
$ git log --pretty="format:$f"

The only difference being that the commit message is not indented.  If you 
really need that, it is easy to add.

But I rather doubt that you need it, as you want to make statistics, and 
therefore need to pipe the output into a script anyway.

Ciao,
Dscho