| 1 |
Author: zmedico |
| 2 |
Date: 2008-12-03 05:42:34 +0000 (Wed, 03 Dec 2008) |
| 3 |
New Revision: 12140 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
Log: |
| 8 |
When calling `git ls-files -m` to list modified files, use --with-tree=HEAD |
| 9 |
so that differences from the most recent commit are given instead of |
| 10 |
differences from the index which is used for commit staging purposes. |
| 11 |
This is required since otherwise files that have been added via `git add` |
| 12 |
(such as echangelog does with the ChangeLog) won't show up in the list |
| 13 |
of modified files due to being unmodified relative to the index. Thanks |
| 14 |
to Christian Ruppert (idl0r) for reporting. |
| 15 |
|
| 16 |
|
| 17 |
Modified: main/trunk/bin/repoman |
| 18 |
=================================================================== |
| 19 |
--- main/trunk/bin/repoman 2008-12-02 23:39:59 UTC (rev 12139) |
| 20 |
+++ main/trunk/bin/repoman 2008-12-03 05:42:34 UTC (rev 12140) |
| 21 |
@@ -737,7 +737,7 @@ |
| 22 |
mychanged = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem and elem[:1] in "MR" ] |
| 23 |
mynew = [ "./" + elem.split()[-1:][0] for elem in svnstatus if elem.startswith("A") ] |
| 24 |
elif vcs == "git": |
| 25 |
- mychanged = os.popen("git ls-files -m").readlines() |
| 26 |
+ mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines() |
| 27 |
mychanged = [ "./" + elem[:-1] for elem in mychanged ] |
| 28 |
mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines() |
| 29 |
strip_levels = repolevel - 1 |
| 30 |
@@ -1733,7 +1733,7 @@ |
| 31 |
for prop in props if " - " in prop) |
| 32 |
|
| 33 |
elif vcs == "git": |
| 34 |
- mychanged = os.popen("git ls-files -m").readlines() |
| 35 |
+ mychanged = os.popen("git ls-files -m --with-tree=HEAD").readlines() |
| 36 |
mychanged = [ "./" + elem[:-1] for elem in mychanged ] |
| 37 |
mynew = os.popen("git diff --cached --name-only --diff-filter=A").readlines() |
| 38 |
strip_levels = repolevel - 1 |
Archives