[gentoo-commits] portage r12141 - main/branches/2.1.6/bin

[gentoo-commits] portage r12141 - main/branches/2.1.6/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-12-03 05:44:07 +0000 (Wed, 03 Dec 2008)
New Revision: 12141

Modified:
   main/branches/2.1.6/bin/repoman
Log:
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)


Modified: main/branches/2.1.6/bin/repoman
===================================================================
--- main/branches/2.1.6/bin/repoman	2008-12-03 05:42:34 UTC (rev 12140)
+++ main/branches/2.1.6/bin/repoman	2008-12-03 05:44:07 UTC (rev 12141)
@@ -737,7 +737,7 @@
 	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 @@
 			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