summaryrefslogtreecommitdiff
path: root/mailmap.h
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius@trolltech.com>2009-02-08 15:34:29 +0100
committerJunio C Hamano <gitster@pobox.com>2009-02-08 12:36:38 -0800
commit0925ce4d49ef8352617e8f56231bd36802a2f138 (patch)
treed6865f15a060e43220bf8de9ba4d27fa022bd50a /mailmap.h
parentcfa1ee6b340172a415049704cd848593392b9064 (diff)
downloadgit-0925ce4d49ef8352617e8f56231bd36802a2f138.tar.gz
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>
Diffstat (limited to 'mailmap.h')
-rw-r--r--mailmap.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/mailmap.h b/mailmap.h
index ba2ee7670c..4b2ca3a7de 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -2,6 +2,10 @@
#define MAILMAP_H
int read_mailmap(struct string_list *map, char **repo_abbrev);
+void clear_mailmap(struct string_list *map);
+
int map_email(struct string_list *mailmap, const char *email, char *name, int maxlen);
+int map_user(struct string_list *mailmap,
+ char *email, int maxlen_email, char *name, int maxlen_name);
#endif