summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-03 05:44:07 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-03 05:44:07 +0000
commitb23ede676486c8a02f68a7281ec973e86123597f (patch)
tree7bd49da06bf2ecc30c21c5dd3ea2b89330d0d65d
parent0c34bd4ee8c73291605c70288ce0516ce4a3a3c7 (diff)
downloadportage-b23ede676486c8a02f68a7281ec973e86123597f.tar.gz
portage-b23ede676486c8a02f68a7281ec973e86123597f.tar.bz2
portage-b23ede676486c8a02f68a7281ec973e86123597f.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. (trunk r12140) svn path=/main/branches/2.1.6/; revision=12141
-rwxr-xr-xbin/repoman4
1 files changed, 2 insertions, 2 deletions
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