Thomas Wolf 8277f62897 Revert 4678f4b and provide another solution for bug 467631 ... Making gitlinks and folders match in a tree walk was the wrong approach to fix bug 467631. The problem is that in such a conflict the tree walk may then not descend into the folder. Revert the changes to Paths.java and PathsTest.java from commit 4678f4b. Instead test for the problem case from bug 467631 explicitly in IndexDiff. Add Daniel's test case from bug 545162, and add yet another test case for DiffEntry.scan() that covers the problem originally reported in bug 545162. Bug: 545162 Change-Id: Ie2214c5d5ee32ac6596b621f0f1c7b86d38fa9b7 Also-by: Daniel Veihelmann <daniel.veihelmann@gmail.com> Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>		2019-04-20 11:19:34 +02:00
..
api	Merge "Fix IndexDiffs for git links"	2018-11-28 06:11:05 -05:00
attributes	gitignore/gitattributes: fix matching of \r	2018-10-27 04:24:05 -04:00
diff	Revert 4678f4b and provide another solution for bug 467631	2019-04-20 11:19:34 +02:00
dircache	DirCacheBuilderTest#testBuildRejectsUnsetFileMode: Add missing fail()	2018-09-29 13:02:26 +09:00
events	Enable and fix 'Should be tagged with @Override' warning	2017-02-19 20:05:08 -04:00
fnmatch	FileNameMatcherTest: Use Character.valueOf rather than new Character	2016-10-19 15:09:37 +09:00
gitrepo	RepoCommand: Preserve executable bit in <copyfile>	2018-10-31 16:40:12 -07:00
ignore	gitignore/gitattributes: fix matching of \r	2018-10-27 04:24:05 -04:00
indexdiff	Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8	2018-09-04 10:53:10 +09:00
internal	Merge branch 'stable-5.1' into stable-5.2	2019-03-21 16:14:12 +01:00
junit	Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8	2018-09-04 10:53:10 +09:00
lib	Revert 4678f4b and provide another solution for bug 467631	2019-04-20 11:19:34 +02:00
merge	MergeFormatter{Pass}: Use Charset instead of String	2018-09-30 14:34:14 +09:00
nls	Enable and fix 'Should be tagged with @Override' warning	2017-02-19 20:05:08 -04:00
notes	Enable and fix warnings about redundant specification of type arguments	2017-02-20 22:47:23 +01:00
patch	Deprecate Constants.CHARSET in favor of StandardCharsets.UTF_8	2018-09-04 10:53:10 +09:00
revplot	Make inner classes static where possible	2018-09-26 08:31:13 +09:00
revwalk	Parse signature of GPG-signed commits	2018-09-04 20:13:16 +02:00
storage/file	Explicitly specify charset when calling getBytes	2018-09-26 08:31:13 +09:00
submodule	Merge branch 'stable-5.1'	2018-10-06 19:28:51 +02:00
symlinks	Fix remaining javadoc errors raised by doclint	2017-12-21 02:42:14 +01:00
test/resources	ObjectDirectory: Add pack directory getter	2017-11-14 10:08:42 -05:00
transport	Merge branch 'stable-5.1' into stable-5.2	2018-12-26 13:26:23 -08:00
treewalk	Explicitly specify charset when calling getBytes	2018-09-26 08:31:13 +09:00
util	Revert 4678f4b and provide another solution for bug 467631	2019-04-20 11:19:34 +02:00