Commit 97bc8988 by Emilio Cobos Álvarez Committed by Nika Layzell

mailmap: Do not error out when the mailmap contains an invalid line

This matches git.
parent 44112db2
...@@ -180,10 +180,10 @@ int git_mailmap_parse( ...@@ -180,10 +180,10 @@ int git_mailmap_parse(
&file, &found, &file, &found,
&real_name, &real_email, &real_name, &real_email,
&replace_name, &replace_email); &replace_name, &replace_email);
if (error < 0) if (error < 0 || !found) {
goto cleanup; error = 0;
if (!found) continue;
break; }
/* Compute how much space we'll need to store our entry */ /* Compute how much space we'll need to store our entry */
size = sizeof(git_mailmap_entry); size = sizeof(git_mailmap_entry);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment