summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2018-03-18 01:39:57 +0100
committerNika Layzell <nika@thelayzells.com>2018-06-14 22:43:27 -0700
commit7bafd175e55d5f6bf96f70973cfff92ee3ca5179 (patch)
treec50ba77027cda39c4f0e0d629cf4860ebccc4631
parent59fbf9cfb0633f2968a8d397074456bfbbef0cad (diff)
downloadlibgit2-7bafd175e55d5f6bf96f70973cfff92ee3ca5179.tar.gz
mailmap: Don't error out when there's junk at the end of the line
Also matches git.
-rw-r--r--src/mailmap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/mailmap.c b/src/mailmap.c
index 850b566ce..dfff47d3a 100644
--- a/src/mailmap.c
+++ b/src/mailmap.c
@@ -126,9 +126,6 @@ static int git_mailmap_parse_single(
if (two_emails && !range_split(line, '>', &email_b, &line))
return -1; /* unfinished <> pair */
- if (line.len > 0)
- return -1; /* junk at end of line */
-
/* Trim whitespace from around names */
range_trim(&name_a);
range_trim(&name_b);