mercurial/subrepo.py
branchstable
changeset 28618 7dab4caf11bc
parent 27935 594bdc380aa2
child 28624 345f4fa4cc89
child 28658 34d43cb85de8
--- a/mercurial/subrepo.py	Sun Mar 13 02:29:11 2016 +0100
+++ b/mercurial/subrepo.py	Thu Mar 24 09:38:11 2016 -0700
@@ -1810,9 +1810,9 @@
         modified, added, removed = [], [], []
         self._gitupdatestat()
         if rev2:
-            command = ['diff-tree', '-r', rev1, rev2]
+            command = ['diff-tree', '--no-renames', '-r', rev1, rev2]
         else:
-            command = ['diff-index', rev1]
+            command = ['diff-index', '--no-renames', rev1]
         out = self._gitcommand(command)
         for line in out.split('\n'):
             tab = line.find('\t')
@@ -1871,7 +1871,7 @@
     @annotatesubrepoerror
     def diff(self, ui, diffopts, node2, match, prefix, **opts):
         node1 = self._state[1]
-        cmd = ['diff']
+        cmd = ['diff', '--no-renames']
         if opts['stat']:
             cmd.append('--stat')
         else: