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

login
register
mail settings
Submitter phabricator
Date March 31, 2018, 8:37 p.m.
Message ID <differential-rev-PHID-DREV-f3t7ascvxqksznuhwqgq-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30075/
State Superseded
Headers show

Comments

phabricator - March 31, 2018, 8:37 p.m.
sheehan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3001

AFFECTED FILES
  mercurial/templatefuncs.py

CHANGE DETAILS




To: sheehan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/templatefuncs.py b/mercurial/templatefuncs.py
--- a/mercurial/templatefuncs.py
+++ b/mercurial/templatefuncs.py
@@ -185,7 +185,7 @@ 
         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')