Merge branch 'ri/mailmapping-empty-email-addresses'

Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
Elijah Newren 2022-10-03 14:48:21 -07:00
commit 4a416be87b

View File

@ -320,8 +320,8 @@ class MailmapInfo(object):
for old, new in self.changes.items():
old_name, old_email = old
new_name, new_email = new
if (not old_email or email.lower() == old_email.lower()) and (
name == old_name or not old_name):
if (old_email is None or email.lower() == old_email.lower()) and (
name == old_name or not old_name):
return (new_name or name, new_email or email)
return (name, email)