mirrors/jgit - jgit - source @ dussan.org

Історія

Christian Halstrick ffa237e7db Fix computation of id in WorkingTreeIterator with autocrlf and smudging JGit failed to do checkouts when the index contained smudged entries and autocrlf was on. In such cases the WorkingTreeIterator calculated the SHA1 sometimes on content which was not correctly filtered. The SHA1 was computed on content which two times went through a lf->crlf conversion. We used to tell the treewalk whether it is a checkin or checkout operation and always use the related filters when reading any content. If on windows and autocrlf is true and we do a checkout operation then we always used a lf->crlf conversion on any text content. That's not correct. Even during a checkout we sometimes need the crlf->lf conversion. E.g. when calculating the content-id for working-tree content we need to use crlf->lf filtering although the overall operation type is checkout. Often this bug does not have effects because we seldom compute the content-id of filesystem content during a checkout. But we do need to know whether a file is dirty or not before we overwrite it during a checkout. And if the index entries are smudged we don't trust the index and compute filesystem-content-sha1's explicitly. This caused EGit not to be able to switch branches anymore on Windows when autocrlf was true. EGit denied the checkout because it thought workingtree files are dirty because content-sha1 are computed on wrongly filtered content. Bug: 493360 Change-Id: I1072a57b4c529ba3aaa50b7b02d2b816bb64a9b8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		8 роки тому
..
api	Fix computation of id in WorkingTreeIterator with autocrlf and smudging	8 роки тому
attributes	Add Attribute Macro Expansion	8 роки тому
diff	PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resource	8 роки тому
dircache	DirCacheBasicTest: Open ObjectInserter.Formatter in try-with-resource	8 роки тому
events	Move base test classes to the junit bundle for reuse for Java 7 tests	11 роки тому
fnmatch	Added characters to be escaped in file name patterns	11 роки тому
gitrepo	Merge branch 'stable-4.2'	8 роки тому
ignore	Fix unused throws CorruptObjectException from addTree	8 роки тому
internal/storage	Add config parameter gc.prunePackExpire for packfile expiration	8 роки тому
junit	Repository: Introduce exactRef and findRef, deprecate getRef	8 роки тому
lib	Remove repository from cache when it's closed	8 роки тому
merge	Revert "Fix warnings about unchecked conversion of MergeResult"	8 роки тому
nls	Move console classes to pgm bundle	9 роки тому
notes	NoteMapTest: Open TreeWalk instances in try-with-resource	8 роки тому
patch	Suppress boxing warnings where we know they are ok	11 роки тому
revplot	Revert "CommitBuilder should check for duplicate parents"	9 роки тому
revwalk	RevCommitListTest: Open Git and RevWalk in try-with-resource	8 роки тому
storage/file	Remove hardcoded target/trash from test cases	10 роки тому
submodule	SubmoduleAddTest: Open Git in try-with-resource	8 роки тому
symlinks	SymlinksTest: Open git and TreeWalk in try-with-resource	8 роки тому
test/resources	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 роки тому
transport	Merge branch 'stable-4.2'	8 роки тому
treewalk	Implement DIR_NO_GITLINKS	8 роки тому
util	Add EOL stream type detection to TreeWalk	8 роки тому