6 files changed, 45 insertions, 8 deletions

diff --git a/source/cgit.c b/source/cgit.c
index ae91dd2..36f3b25 100644
--- a/source/cgit.c
+++ b/source/cgit.c
@@ -107,6 +107,7 @@ static void prepare_context(void)
 	ctx.cfg.local_time = 0;
 	ctx.cfg.date_mode = date_mode_from_type(DATE_SHORT);
 	ctx.cfg.enable_header = 1;
+	ctx.cfg.enable_mailmap = 1;
 	ctx.cfg.enable_plain_email = 1;
 	ctx.cfg.enable_relative_dates = 1;
 	ctx.cfg.enable_http_clone = 1;
@@ -239,6 +240,7 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
 	fprintf(f, "repo.enable-gitmodules-links=%d\n", repo->enable_gitmodules_links);
 	fprintf(f, "repo.enable-log-filecount=%d\n", repo->enable_log_filecount);
 	fprintf(f, "repo.enable-log-linecount=%d\n", repo->enable_log_linecount);
+	fprintf(f, "repo.enable-mailmap=%d\n", repo->enable_mailmap);
 	if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
 		cgit_fprintf_filter(repo->about_filter, f, "repo.about-filter=");
 	if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
@@ -557,6 +559,8 @@ static void apply_config(const char *name, const char *value)
 		ctx.cfg.enable_log_filecount = atoi(value);
 	else if (!strcmp(name, "enable-log-linecount"))
 		ctx.cfg.enable_log_linecount = atoi(value);
+	else if (!strcmp(name, "enable-mailmap"))
+		ctx.cfg.enable_mailmap = atoi(value);
 	else if (!strcmp(name, "enable-relative-dates"))
 		ctx.cfg.enable_relative_dates = atoi(value);
 	else if (!strcmp(name, "enable-remote-branches"))
@@ -1168,6 +1172,8 @@ void cgit_repo_config(struct cgit_repo *repo, const char *name, const char *valu
 		repo->enable_log_filecount = atoi(value);
 	else if (!strcmp(name, "enable-log-linecount"))
 		repo->enable_log_linecount = atoi(value);
+	else if (!strcmp(name, "enable-mailmap"))
+		repo->enable_mailmap = atoi(value);
 	else if (!strcmp(name, "enable-remote-branches"))
 		repo->enable_remote_branches = atoi(value);
 	else if (!strcmp(name, "enable-subject-links"))
diff --git a/source/cgit.h b/source/cgit.h
index d976906..5a9e756 100644
--- a/source/cgit.h
+++ b/source/cgit.h
@@ -88,6 +88,7 @@ struct cgit_repo {
 	int enable_gitmodules_links;
 	int enable_log_filecount;
 	int enable_log_linecount;
+	int enable_mailmap;
 	int enable_remote_branches;
 	int enable_subject_links;
 	int enable_trailers;
@@ -226,6 +227,7 @@ struct cgit_config {
 	int enable_commit_graph;
 	int enable_log_filecount;
 	int enable_log_linecount;
+	int enable_mailmap;
 	int enable_plain_email;
 	int enable_relative_dates;
 	int enable_remote_branches;
diff --git a/source/parsing.c b/source/parsing.c
index c992538..587f44d 100644
--- a/source/parsing.c
+++ b/source/parsing.c
@@ -13,6 +13,8 @@
 #include "parsing.h"
 #include "shared.h"
 
+#include <mailmap.h>
+
 static char *substr(const char *start, const char *end)
 {
 	size_t len;
@@ -29,22 +31,45 @@ static char *substr(const char *start, const char *end)
 	return buf;
 }
 
+/*
+ * The repository's mailmap, read once per request and applied to every ident
+ * a page shows. Only the blob at HEAD is read, the way git reads a bare
+ * repository, so a repository cannot point the reader at a file on the server.
+ */
+static struct string_list mailmap = STRING_LIST_INIT_DUP;
+static int mailmap_read;
+
+struct string_list *cgit_mailmap(void)
+{
+	if (!ctx.repo || !ctx.repo->enable_mailmap)
+		return NULL;
+	if (!mailmap_read) {
+		mailmap_read = 1;
+		read_mailmap_blob(the_repository, &mailmap, "HEAD:.mailmap");
+	}
+	return mailmap.nr ? &mailmap : NULL;
+}
+
 static void parse_user(const char *line, char **name, char **email, timestamp_t *date, int *tz)
 {
 	struct ident_split ident;
 	struct strbuf address = STRBUF_INIT;
-	ptrdiff_t email_len;
+	struct string_list *map;
+	const char *name_start, *mail_start;
+	size_t name_len, mail_len;
 
 	if (!split_ident_line(&ident, line, strchrnul(line, '\n') - line)) {
-		*name = substr(ident.name_begin, ident.name_end);
+		name_start = ident.name_begin;
+		name_len = ident.name_end - ident.name_begin;
+		mail_start = ident.mail_begin;
+		mail_len = ident.mail_end - ident.mail_begin;
+		map = cgit_mailmap();
+		if (map)
+			map_user(map, &mail_start, &mail_len, &name_start, &name_len);
+		*name = xmemdupz(name_start, name_len);
 
-		// Assembled rather than formatted. The length is a pointer
-		// difference, and the precision of a %.*s conversion has to be
-		// an int, which cannot hold one on a 64 bit host.
-		email_len = ident.mail_end - ident.mail_begin;
 		strbuf_addch(&address, '<');
-		if (email_len > 0)
-			strbuf_add(&address, ident.mail_begin, email_len);
+		strbuf_add(&address, mail_start, mail_len);
 		strbuf_addch(&address, '>');
 		*email = strbuf_detach(&address, NULL);
 
diff --git a/source/parsing.h b/source/parsing.h
index b1dc9f1..d213429 100644
--- a/source/parsing.h
+++ b/source/parsing.h
@@ -14,6 +14,7 @@
 // storing them in ctx.qry.
 extern void cgit_parse_url(const char *url);
 
+extern struct string_list *cgit_mailmap(void);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 
diff --git a/source/shared.c b/source/shared.c
index 59712ce..6ac2353 100644
--- a/source/shared.c
+++ b/source/shared.c
@@ -213,6 +213,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
 	repo->enable_gitmodules_links = ctx.cfg.enable_gitmodules_links;
 	repo->enable_log_filecount = ctx.cfg.enable_log_filecount;
 	repo->enable_log_linecount = ctx.cfg.enable_log_linecount;
+	repo->enable_mailmap = ctx.cfg.enable_mailmap;
 	repo->enable_remote_branches = ctx.cfg.enable_remote_branches;
 	repo->enable_subject_links = ctx.cfg.enable_subject_links;
 	repo->enable_trailers = ctx.cfg.enable_trailers;
diff --git a/source/ui-log.c b/source/ui-log.c
index 8fe58f9..316df75 100644
--- a/source/ui-log.c
+++ b/source/ui-log.c
@@ -492,6 +492,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 		strvec_push(&rev_argv, path);
 
 	repo_init_revisions(the_repository, &rev, NULL);
+	// The author and committer searches then match the mapped idents.
+	rev.mailmap = cgit_mailmap();
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
 	rev.verbose_header = 1;