Merge branch 'bd/diff-strbuf'

diff --git a/pretty.c b/pretty.c
index 628a5201c1e8aa3b985bf0b382e5511e17d953d4..33ef34a4119812674726254fee3f391fb5734fdb 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -3,7 +3,7 @@
 #include "utf8.h"
 #include "diff.h"
 #include "revision.h"
-#include "path-list.h"
+#include "string-list.h"
 #include "mailmap.h"
 
 static char *user_format;
@@ -292,7 +292,7 @@ static char *logmsg_reencode(const struct commit *commit,
 
 static int mailmap_name(struct strbuf *sb, const char *email)
 {
-       static struct path_list *mail_map;
+       static struct string_list *mail_map;
        char buffer[1024];
 
        if (!mail_map) {