X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=mailmap.c;h=bb1f2fb711a588d2af0d61decbd4b3eb2f2aebbe;hb=2aaa84567e37f3c90087b56f9440a1608cac2282;hp=6be91b60dfc8c37bd21c45d1480f7b3cf1fe5a99;hpb=1966af81760aea2966f8f218d442aed5f296b992;p=git.git

diff --git a/mailmap.c b/mailmap.c
index 6be91b60d..bb1f2fb71 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -99,7 +99,8 @@ static void add_mapping(struct string_list *map,
 		 old_name, old_email, new_name, new_email);
 }
 
-static char *parse_name_and_email(char *buffer, char **name, char **email)
+static char *parse_name_and_email(char *buffer, char **name,
+		char **email, int allow_empty_email)
 {
 	char *left, *right, *nstart, *nend;
 	*name = *email = 0;
@@ -108,7 +109,7 @@ static char *parse_name_and_email(char *buffer, char **name, char **email)
 		return NULL;
 	if ((right = strchr(left+1, '>')) == NULL)
 		return NULL;
-	if (left+1 == right)
+	if (!allow_empty_email && (left+1 == right))
 		return NULL;
 
 	/* remove whitespace from beginning and end of name */
@@ -159,8 +160,8 @@ static int read_single_mailmap(struct string_list *map, const char *filename, ch
 			}
 			continue;
 		}
-		if ((name2 = parse_name_and_email(buffer, &name1, &email1)) != NULL)
-			parse_name_and_email(name2, &name2, &email2);
+		if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
+			parse_name_and_email(name2, &name2, &email2, 1);
 
 		if (email1)
 			add_mapping(map, name1, email1, name2, email2);