mirrors/jgit - jgit - source @ dussan.org

Vēsture

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>		pirms 8 gadiem
..
blame	BlameGeneratorTest: Create Git instances in try-with-resource	pirms 8 gadiem
AbstractRemoteCommandTest.java	Add remote command to JGit CLI	pirms 8 gadiem
AddCommandTest.java	Implement DIR_NO_GITLINKS	pirms 8 gadiem
ApplyCommandTest.java	Fix ApplyCommand when result of patch is an empty file	pirms 8 gadiem
ArchiveCommandTest.java	ArchiveCommandTest: Create Git instances in try-with-resource	pirms 8 gadiem
BlameCommandTest.java	BlameCommandTest: Instantiate Git objects in try-with-resource	pirms 8 gadiem
BranchCommandTest.java	BranchCommandTest: Create Git instances in try-with-resource	pirms 8 gadiem
CheckoutCommandTest.java	Fix calling of clean/smudge filters from Checkout,MergeCommands	pirms 8 gadiem
CherryPickCommandTest.java	CherryPickCommandTest: Create Git instances in try-with-resource	pirms 8 gadiem
CleanCommandTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	pirms 11 gadiem
CloneCommandTest.java	Treat CloneCommand.setRemote(null) as setRemote("origin")	pirms 9 gadiem
CommitAndLogCommandTest.java	CommitAndLogCommandTest: Use assumeFalse to skip test on Windows	pirms 8 gadiem
CommitCommandTest.java	CommitCommandTest: Open Git and TreeWalk in try-with-resource	pirms 8 gadiem
CommitOnlyTest.java	CommitOnlyTest: Open RevWalk in try-with-resource	pirms 8 gadiem
DescribeCommandTest.java	Add "--long" option to JGit describe	pirms 9 gadiem
DiffCommandTest.java	DiffCommandTest: Open Git and RevWalk in try-with-resource	pirms 8 gadiem
EolRepositoryTest.java	Fix computation of id in WorkingTreeIterator with autocrlf and smudging	pirms 8 gadiem
EolStreamTypeUtilTest.java	Add EOL stream type detection to TreeWalk	pirms 8 gadiem
FetchCommandTest.java	Update tags on fetch if --tags or tag refspec specified	pirms 11 gadiem
GarbageCollectCommandTest.java	Cache SimpleDateFormat in GitDateParser per locale	pirms 10 gadiem
GitConstructionTest.java	GitConstructionTest: Open Git instance in try-with-resource	pirms 8 gadiem
HugeFileTest.java	HugeFileTest: Make Git a class member and open in try-with-resource	pirms 8 gadiem
InitCommandTest.java	Allow explicit configuration of git directory in InitCommand	pirms 9 gadiem
LogCommandTest.java	LogCommand.all(): filter out refs that do not refer to commit objects	pirms 11 gadiem
LsRemoteCommandTest.java	Use absolute paths for file:// URIs in tests	pirms 10 gadiem
MergeCommandTest.java	MergeCommandTest: Use JUnit's assume to check preconditions	pirms 8 gadiem
NameRevCommandTest.java	Repository: Introduce exactRef and findRef, deprecate getRef	pirms 8 gadiem
NotesCommandTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	pirms 11 gadiem
PathCheckoutCommandTest.java	Checkout should be able to override modified symbolic links	pirms 8 gadiem
PullCommandTest.java	PullCommandTest: Open RevWalk in try-with-resource	pirms 8 gadiem
PullCommandWithRebaseTest.java	PullCommandWithRebaseTest: Open RevWalk in try-with-resource	pirms 8 gadiem
PushCommandTest.java	PushCommandTest: Open Git instances in try-with-resource	pirms 8 gadiem
RebaseCommandTest.java	RebaseCommandTest: Open RevWalk in try-with-resource	pirms 8 gadiem
ReflogCommandTest.java	Make the Reflog a public API again	pirms 11 gadiem
RemoteAddCommandTest.java	Add remote command to JGit CLI	pirms 8 gadiem
RemoteDeleteCommandTest.java	Add remote command to JGit CLI	pirms 8 gadiem
RemoteListCommandTest.java	Add remote command to JGit CLI	pirms 8 gadiem
RemoteSetUrlCommandTest.java	Add remote command to JGit CLI	pirms 8 gadiem
RenameBranchCommandTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	pirms 11 gadiem
ResetCommandTest.java	ResetCommandTest: Use Git member in testHardResetAfterSquashMerge	pirms 8 gadiem
RevertCommandTest.java	RevertCommandTest: Open Git in try-with-resource	pirms 8 gadiem
RmCommandTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	pirms 11 gadiem
StashApplyCommandTest.java	Fix integer boxing eclipse warning	pirms 8 gadiem
StashCreateCommandTest.java	Repository: Introduce exactRef and findRef, deprecate getRef	pirms 8 gadiem
StashDropCommandTest.java	Repository: Introduce exactRef and findRef, deprecate getRef	pirms 8 gadiem
StashListCommandTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	pirms 11 gadiem
StatusCommandTest.java	StatusCommandTest: Open Git in try-with-resource	pirms 8 gadiem
TagCommandTest.java	TagCommandTest: Instantiate Git and RevWalk objects in try-with-resource	pirms 8 gadiem