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

Signed-off-by: Elijah Newren <[email protected]>
ReinventorsOfTheWheel · Oct 3, 2022 · 4a416be · 4a416be
2 parents 9cf6121 + 91f16fd
commit 4a416be
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/git-filter-repo b/git-filter-repo
@@ -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)