When calling `git ls-files -m` to list modified files, use --with-tree=HEAD

so that differences from the most recent commit are given instead of
differences from the index which is used for commit staging purposes.
This is required since otherwise files that have been added via `git add`
(such as echangelog does with the ChangeLog) won't show up in the list
of modified files due to being unmodified relative to the index. Thanks
to Christian Ruppert (idl0r) for reporting. (trunk r12140)

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

diff --git a/bin/repoman b/bin/repoman
index 06c0447edb40472759ffac8ed63abdd85ceb7603..9c4e1ad91275f1ae1c5a07bc12929b9d870851aa 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -737,7 +737,7 @@ if vcs == "svn":
        mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ]
        mynew     = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ]
 elif vcs == "git":
-       mychanged = os.popen("git ls-files -m").readlines()
+       mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines()
        mychanged = [ "./" +  elem[:-1] for elem in mychanged ]
        mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines()
        strip_levels = repolevel - 1
@@ -1733,7 +1733,7 @@ else:
                        for prop in props if " - " in prop)
 
        elif vcs == "git":
-               mychanged = os.popen("git ls-files -m").readlines()
+               mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines()
                mychanged = [ "./" +  elem[:-1] for elem in mychanged ]
                mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines()
                strip_levels = repolevel - 1