Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 24943:3e39f67ef663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: correctly handle git subdirectory status change 'git diff-index' by default does not recurse into subdirectories when changes are found. As a result, the directory is shown as changed, rather than the files in this directory. Adding '-r' results in recursing until the blobs themselves are checked.
author Mathias De Mar? <mathias.demare@gmail.com>
date Wed, 06 May 2015 17:15:38 +0200
parents 41cd8171e58f
children df63d4843581
line wrap: on
line diff
--- a/mercurial/subrepo.py	Wed May 06 16:56:28 2015 -0500
+++ b/mercurial/subrepo.py	Wed May 06 17:15:38 2015 +0200
@@ -1711,7 +1711,7 @@
         modified, added, removed = [], [], []
         self._gitupdatestat()
         if rev2:
-            command = ['diff-tree', rev1, rev2]
+            command = ['diff-tree', '-r', rev1, rev2]
         else:
             command = ['diff-index', rev1]
         out = self._gitcommand(command)