summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-03 05:42:34 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-03 05:42:34 +0000
commit5c1fc7525927985fb97dcdb851808e48fee60614 (patch)
tree5d9ab7533604009e431abe0c32ec8cbd998db263
parentd6550d32de30c01eac956c36951090bef4ec8fd8 (diff)
downloadportage-5c1fc7525927985fb97dcdb851808e48fee60614.tar.gz
portage-5c1fc7525927985fb97dcdb851808e48fee60614.tar.bz2
portage-5c1fc7525927985fb97dcdb851808e48fee60614.zip
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. svn path=/main/trunk/; revision=12140
-rwxr-xr-xbin/repoman4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index ae4109b70..d773419b9 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