X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mailmap.c;h=87141670595c50a4fa7b87a12b85ff0e2b7da8af;hb=154c7d0759b6885034bffa7a34d464d703fc8bb3;hp=c29e4e534925d250007507b3259855213b9500cc;hpb=600682aaa12c56d55bd24233828205c43ece2ded;p=git.git diff --git a/mailmap.c b/mailmap.c index c29e4e534..871416705 100644 --- a/mailmap.c +++ b/mailmap.c @@ -1,5 +1,6 @@ #include "cache.h" #include "path-list.h" +#include "mailmap.h" int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev) { @@ -17,6 +18,9 @@ int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev int abblen = sizeof(abbrev) - 1; int len = strlen(buffer); + if (!repo_abbrev) + continue; + if (len && buffer[len - 1] == '\n') buffer[--len] = 0; if (!strncmp(buffer, abbrev, abblen)) { @@ -85,4 +89,3 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen) } return 0; } -