diff -r fabb0224a599 -r b44f1703b28c mercurial/commands.py
--- a/mercurial/commands.py	Thu Jan 17 09:24:30 2019 -0800
+++ b/mercurial/commands.py	Thu Sep 06 15:56:53 2018 -0700
@@ -2944,16 +2944,18 @@
                 fnode = ctx.filenode(fn)
             except error.LookupError:
                 continue
-            try:
-                copied = flog.renamed(fnode)
-            except error.WdirUnsupported:
-                copied = ctx[fn].renamed()
-            copy = follow and copied and copied[0]
-            if copy:
-                copies.setdefault(rev, {})[fn] = copy
+            copy = None
+            if follow:
+                try:
+                    copied = flog.renamed(fnode)
+                except error.WdirUnsupported:
+                    copied = ctx[fn].renamed()
+                copy = copied and copied[0]
+                if copy:
+                    copies.setdefault(rev, {})[fn] = copy
+                    if fn in skip:
+                        skip[copy] = True
             if fn in skip:
-                if copy:
-                    skip[copy] = True
                 continue
             files.append(fn)