From 91f16fd5ed2b0fff5f35e63dd0e15ac1f502c444 Mon Sep 17 00:00:00 2001 From: Riley Iverson Date: Tue, 4 Oct 2022 10:35:18 +1300 Subject: [PATCH] Correct mailmapping of empty email addresses `not old_email` doesn't distinguish between `None` and an empty string, causing old emails specified as `<>` to apply to every single commit. Signed-off-by: Riley Iverson --- git-filter-repo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-filter-repo b/git-filter-repo index 22826b5..1696a6c 100755 --- 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)