mirrors/jgit - jgit - source @ dussan.org

Vēsture

Thomas Wolf 5332723729 DiffFormatter: correctly deal with tracked files in ignored folders In JGit 5.0, the FileTreeIterator was changed to skip ignored folders by default. To catch tracked files inside ignored folders, the tree walk needs to have a DirCacheIterator, and the FileTreeIterator has to know about that DirCacheIterator via setDirCacheIterator(). (Or the optimization has to be switched off explicitly via setWalkIgnoredDirectories(true).) Skipping ignored directories is an important optimization in some cases, for instance in node.js/npm projects, where we'd otherwise traverse the whole huge and deep hierarchy of the typically ignored node_modules folder. While all uses of WorkingTreeIterator in JGit had been adapted, DiffFormatter was forgotten. To make it work correctly (again) also for such cases, make it set up a WorkingTreeeIterator automatically, and make sure the WorkingTreeSource can find such files, too. Also pass the repository to the TreeWalks used inside the DiffFormatter to pick up the correct attributes, filters, and line-ending settings. Bug: 565081 Change-Id: Ie88ac81166dc396ba28b83313964c1712b6ca199 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>		pirms 3 gadiem
..
annotations	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
api	Add Git#shutdown for releasing resources held by JGit process	pirms 4 gadiem
attributes	Merge branch 'stable-5.6'	pirms 4 gadiem
blame	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
diff	DiffFormatter: correctly deal with tracked files in ignored folders	pirms 3 gadiem
dircache	Fix error occurring during checkout	pirms 4 gadiem
errors	Merge branch 'stable-5.6'	pirms 4 gadiem
events	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
fnmatch	Fix ProtectedMembersInFinalClass warning flagged by error prone	pirms 4 gadiem
gitrepo	ErrorProne: Enable and fix UnusedException check	pirms 4 gadiem
hooks	Remove use of org.bouncycastle.util.io.TeeOutputStream	pirms 4 gadiem
ignore	Merge branch 'stable-5.6'	pirms 4 gadiem
internal	MergedReftable: Include the last reftable in determining minUpdateIndex	pirms 3 gadiem
lib	Fix writing GPG signatures with trailing newline	pirms 3 gadiem
merge	ResolveMerger: Ignore merge conflicts if asked so	pirms 4 gadiem
nls	Add Git#shutdown for releasing resources held by JGit process	pirms 4 gadiem
notes	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
patch	Merge branch 'stable-5.6'	pirms 4 gadiem
revplot	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
revwalk	Fix wrong @since tags added in dcb0265	pirms 4 gadiem
storage	WindowCache: conditional JMX setup	pirms 4 gadiem
submodule	Update EDL 1.0 license headers to new short SPDX compliant format	pirms 4 gadiem
transport	Remove trailing whitespace	pirms 4 gadiem
treewalk	DiffFormatter: correctly deal with tracked files in ignored folders	pirms 3 gadiem
util	Verify that the user home directory is valid	pirms 4 gadiem