298     # If the author field coming in isn't in the correct format,

   298     # If the author field coming in isn't in the correct format,

   299     # or the mailmap is empty just return the original author field

   299     # or the mailmap is empty just return the original author field

   300     if not isauthorwellformed(author) or not mailmap:

   300     if not isauthorwellformed(author) or not mailmap:

   301         return author

   301         return author

   302 

   302 

   304     commit = mailmapping(name=person(author), email=email(author))

   304     commit = mailmapping(name=person(author), email=email(author))

   305 

   305 

   306     try:

   306     try:

   307         # Try and use both the commit email and name as the key

   307         # Try and use both the commit email and name as the key

   308         proper = mailmap[commit]

   308         proper = mailmap[commit]