mirrors/jgit - jgit - source @ dussan.org

Historie

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>		před 8 roky
..
api	Fix computation of id in WorkingTreeIterator with autocrlf and smudging	před 8 roky
attributes	Add Attribute Macro Expansion	před 8 roky
diff	PatchIdDiffFormatterTest: Open Git and PatchIdDiffFormatter in try-with-resource	před 8 roky
dircache	DirCacheBasicTest: Open ObjectInserter.Formatter in try-with-resource	před 8 roky
events	Move base test classes to the junit bundle for reuse for Java 7 tests	před 11 roky
fnmatch	Added characters to be escaped in file name patterns	před 11 roky
gitrepo	Merge branch 'stable-4.2'	před 8 roky
ignore	Fix unused throws CorruptObjectException from addTree	před 8 roky
internal/storage	Add config parameter gc.prunePackExpire for packfile expiration	před 8 roky
junit	Repository: Introduce exactRef and findRef, deprecate getRef	před 8 roky
lib	Remove repository from cache when it's closed	před 8 roky
merge	Revert "Fix warnings about unchecked conversion of MergeResult"	před 8 roky
nls	Move console classes to pgm bundle	před 9 roky
notes	NoteMapTest: Open TreeWalk instances in try-with-resource	před 8 roky
patch	Suppress boxing warnings where we know they are ok	před 11 roky
revplot	Revert "CommitBuilder should check for duplicate parents"	před 9 roky
revwalk	RevCommitListTest: Open Git and RevWalk in try-with-resource	před 8 roky
storage/file	Remove hardcoded target/trash from test cases	před 10 roky
submodule	SubmoduleAddTest: Open Git in try-with-resource	před 8 roky
symlinks	SymlinksTest: Open git and TreeWalk in try-with-resource	před 8 roky
test/resources	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	před 10 roky
transport	Merge branch 'stable-4.2'	před 8 roky
treewalk	Implement DIR_NO_GITLINKS	před 8 roky
util	Add EOL stream type detection to TreeWalk	před 8 roky