reproduce mailmap parsing issue (#1416)

Author: Byron

gix-mailmap/src/entry.rs

@@ -41,6 +41,18 @@ impl<'a> Entry<'a> {
             ..Default::default()
         }
     }
+    pub fn change_email_by_name_and_email(
+        proper_email: impl Into<&'a BStr>,
+        commit_name: impl Into<&'a BStr>,
+        commit_email: impl Into<&'a BStr>,
+    ) -> Self {
+        Entry {
+            new_email: Some(proper_email.into()),
+            old_email: commit_email.into(),
+            old_name: Some(commit_name.into()),
+            ..Default::default()
+        }
+    }
     pub fn change_name_and_email_by_email(
         proper_name: impl Into<&'a BStr>,
         proper_email: impl Into<&'a BStr>,

gix-mailmap/tests/fixtures/typical.txt

@@ -6,3 +6,4 @@ Joe R. Developer <[email protected]> Joe <[email protected]>
 Jane Doe <[email protected]> <jane@laptop.(none)>
 Jane Doe <[email protected]> <jane@desktop.(none)>
 Jane Doe <[email protected]> Jane <[email protected]>
+<[email protected]> Jane <Jane@ipad.(none)>

gix-mailmap/tests/parse/mod.rs

@@ -31,6 +31,7 @@ fn a_typical_mailmap() {
             Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@laptop.(none)"),
             Entry::change_name_and_email_by_email("Jane Doe", "[email protected]", "jane@desktop.(none)"),
             Entry::change_name_and_email_by_name_and_email("Jane Doe", "[email protected]", "Jane", "[email protected]"),
+            Entry::change_email_by_name_and_email("[email protected]", "Jane", "Jane@ipad.(none)"),
         ]
     );
 }
@@ -76,8 +77,8 @@ fn valid_entries() {
         Entry::change_name_and_email_by_email("proper name", "proper email", "commit-email")
     );
     assert_eq!(
-        line(" proper name  <proper email>\tcommit name\t<commit-email>\t"),
-        Entry::change_name_and_email_by_name_and_email("proper name", "proper email", "commit name", "commit-email")
+        line("<proper-email> commit name <commit-email>"),
+        Entry::change_email_by_name_and_email("proper-email", "commit name", "commit-email")
     );
 }
 

gix-mailmap/tests/snapshot/mod.rs

@@ -31,6 +31,11 @@ fn try_resolve() {
         Some(signature("Jane Doe", "[email protected]")),
         "name and email can be mapped specifically, case insensitive matching of name"
     );
+    assert_eq!(
+        snapshot.resolve(signature("janE", "jane@ipad.(none)").to_ref()),
+        signature("janE", "[email protected]"),
+        "an email can be mapped by name and email specifically, both match case-insensitively"
+    );
 
     let sig = signature("Jane", "[email protected]");
     assert_eq!(snapshot.try_resolve(sig.to_ref()), None, "unmatched email");
@@ -49,7 +54,7 @@ fn try_resolve() {
     );
     assert_eq!(snapshot.resolve(sig.to_ref()), sig);
 
-    assert_eq!(snapshot.entries().len(), 5);
+    assert_eq!(snapshot.entries().len(), 6);
 }
 
 #[test]