diff -r 3dcc96582627 -r 4145fd3569c3 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Fri Jan 04 17:54:18 2019 +0100
+++ b/mercurial/cmdutil.py	Thu Jan 10 21:32:37 2019 +0900
@@ -2450,7 +2450,8 @@
             date = dateutil.parsedate(opts.get('date'))
         elif opts.get('currentdate'):
             date = dateutil.makedate()
-        elif ui.configbool('rewrite', 'update-timestamp'):
+        elif (ui.configbool('rewrite', 'update-timestamp')
+              and opts.get('currentdate') is None):
             date = dateutil.makedate()
             datemaydiffer = True
         else: