# HG changeset patch
# User Connor Sheehan <sheehan@mozilla.com>
# Date 2018-03-31 14:13:42
# Node ID 3685a79ea51bcef25386345d44550a084961fe30
# Parent  3e293808e83557021a25fd8efbfcc66e094ae1b7

templatefuncs: remove redundant "or author" from mailmap return statement

Differential Revision: https://phab.mercurial-scm.org/D3001

diff --git a/mercurial/templatefuncs.py b/mercurial/templatefuncs.py
--- a/mercurial/templatefuncs.py
+++ b/mercurial/templatefuncs.py
@@ -184,7 +184,7 @@ def mailmap(context, mapping, args):
         data = repo.wvfs.tryread('.mailmap')
         cache['mailmap'] = stringutil.parsemailmap(data)
 
-    return stringutil.mapname(cache['mailmap'], author) or author
+    return stringutil.mapname(cache['mailmap'], author)
 
 @templatefunc('pad(text, width[, fillchar=\' \'[, left=False]])',
               argspec='text width fillchar left')