diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2018-03-17 17:40:24 +0100 |
|---|---|---|
| committer | Nika Layzell <nika@thelayzells.com> | 2018-06-14 22:43:27 -0700 |
| commit | 97bc898828f8a281f292cef8913e6ec2dc13eef9 (patch) | |
| tree | ecad139b08cf7666b96b2977fb42ac7c4af1107f /src/mailmap.c | |
| parent | 44112db208c92685ddaea4010b266cc411a062b2 (diff) | |
| download | libgit2-97bc898828f8a281f292cef8913e6ec2dc13eef9.tar.gz | |
mailmap: Do not error out when the mailmap contains an invalid line
This matches git.
Diffstat (limited to 'src/mailmap.c')
| -rw-r--r-- | src/mailmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mailmap.c b/src/mailmap.c index 12b684f6a..54ef72066 100644 --- a/src/mailmap.c +++ b/src/mailmap.c @@ -180,10 +180,10 @@ int git_mailmap_parse( &file, &found, &real_name, &real_email, &replace_name, &replace_email); - if (error < 0) - goto cleanup; - if (!found) - break; + if (error < 0 || !found) { + error = 0; + continue; + } /* Compute how much space we'll need to store our entry */ size = sizeof(git_mailmap_entry); |