From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 3 Dec 2008 05:44:07 +0000 (-0000)
Subject: When calling `git ls-files -m` to list modified files, use --with-tree=HEAD
X-Git-Tag: v2.1.6_rc3~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b23ede676486c8a02f68a7281ec973e86123597f;p=portage.git

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 06c0447ed..9c4e1ad91 100755
--- 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