Inside git_sync_timestamps(), use git-diff-index for the same reason that

repoman now uses it since bug #252727. (trunk r12360)

svn path=/main/branches/2.1.6/; revision=12431

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c53c819e82d6698c21046205fee1ae45a26877c7..1d87320e8b957174930e9cd6737e865b61e8646d 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -12105,7 +12105,7 @@ def git_sync_timestamps(settings, portdir):
                return 1
 
        args = [portage.const.BASH_BINARY, "-c",
-               "cd %s && git ls-files -m --with-tree=HEAD" % \
+               "cd %s && git diff-index --name-only --diff-filter=M HEAD" % \
                portage._shell_quote(portdir)]
        import subprocess
        proc = subprocess.Popen(args, stdout=subprocess.PIPE)