Code

Add map_user() and clear_mailmap() to mailmap
authorMarius Storm-Olsen <marius@trolltech.com>
Sun, 8 Feb 2009 14:34:29 +0000 (15:34 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 8 Feb 2009 20:36:38 +0000 (12:36 -0800)
commit0925ce4d49ef8352617e8f56231bd36802a2f138
treed6865f15a060e43220bf8de9ba4d27fa022bd50a
parentcfa1ee6b340172a415049704cd848593392b9064
Add map_user() and clear_mailmap() to mailmap

map_user() allows to lookup and replace both email and
name of a user, based on a new style mailmap file.

The possible mailmap definitions are now:

  proper_name <commit_email>                             # Old style
  <proper_email> <commit_email>                          # New style
  proper_name <proper_email> <commit_email>              # New style
  proper_name <proper_email> commit_name <commit_email>  # New style

map_email() operates the same as before, with the
exception that it also will to try to match on a name
passed in through the name return buffer.

clear_mailmap() is needed to now clear the more complex
mailmap structure.

Signed-off-by: Marius Storm-Olsen <marius@trolltech.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-shortlog.txt
mailmap.c
mailmap.h