| commit | 7f4234445bfc112939b14e6f8397cce10515dd20 | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Thu, 29 Apr 2021 09:44:44 +0000 (29 11:44 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Tue, 1 Jun 2021 10:32:04 +0000 (1 12:32 +0200) | ||
| tree | a26f05bde7e672dc90acfffc7cce73f116453e35 | treesnapshot (tar.gz zip) |
| parent | 522e87c083225fea42f765f4f10f7ae967dce936 | commitdiff |
[merge] Detect conflicting files underneath ignored folders
Fix the TreeWalk setup. Don't use the NotIgnoredFilter; it prunes
ignored directories top-down without checking whether there are
tracked resources underneath. Instead just set the DirCacheIterator
on the FileTreeIterator; it then does the right thing out of the
box: it skips ignored directories unless there are tracked files
underneath.
Bug: 483596
Change-Id: Ie062384655dfc4cedf40c32be95eeb133b6de954
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Fix the TreeWalk setup. Don't use the NotIgnoredFilter; it prunes
ignored directories top-down without checking whether there are
tracked resources underneath. Instead just set the DirCacheIterator
on the FileTreeIterator; it then does the right thing out of the
box: it skips ignored directories unless there are tracked files
underneath.
Bug: 483596
Change-Id: Ie062384655dfc4cedf40c32be95eeb133b6de954
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>