From 5c1fc7525927985fb97dcdb851808e48fee60614 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 3 Dec 2008 05:42:34 +0000 Subject: 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 --- bin/repoman | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index ae4109b7..d773419b 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 -- cgit v1.2.3-65-gdbad