mirror of
https://github.com/newren/git-filter-repo.git
synced 2024-07-04 01:15:41 +02:00
Merge branch 'ri/mailmapping-empty-email-addresses'
Signed-off-by: Elijah Newren <newren@gmail.com>
This commit is contained in:
commit
4a416be87b
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user