Add map_user() and clear_mailmap() to mailmap

diff --git a/pretty.c b/pretty.c
index b1b86202e1fcf854c64f268b950d2c2f9d956d16..9e03d6ae2d0a31170e1f5763ceb2b45dffa3b8bb 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -312,7 +312,7 @@ static int mailmap_name(struct strbuf *sb, const char *email)
 
        if (!mail_map) {
                mail_map = xcalloc(1, sizeof(*mail_map));
-               read_mailmap(mail_map, ".mailmap", NULL);
+               read_mailmap(mail_map, NULL);
        }
 
        if (!mail_map->nr)
@@ -487,8 +487,8 @@ static void parse_commit_header(struct format_commit_context *context)
        context->commit_header_parsed = 1;
 }
 
-static const char *format_subject(struct strbuf *sb, const char *msg,
-                                 const char *line_separator)
+const char *format_subject(struct strbuf *sb, const char *msg,
+                          const char *line_separator)
 {
        int first = 1;