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

Signed-off-by: Elijah Newren <newren@gmail.com>
2 years ago · 4a416be87b
parent 9cf6121b34 91f16fd5ed
commit 4a416be87b
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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)