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 години
..
annotations	Use runtime retention for Nullable annotation	преди 8 години
api	Fix ApplyCommand when result of patch is an empty file	преди 8 години
attributes	Add Attribute Macro Expansion	преди 8 години
blame	Replace deprecated release() methods by close()	преди 9 години
diff	Merge branch 'stable-4.1' into stable-4.2	преди 8 години
dircache	Fix calling of clean/smudge filters from Checkout,MergeCommands	преди 8 години
errors	Merge changes Idaed9310,I62bd7c0b	преди 8 години
events	Mark non-externalizable strings as such	преди 11 години
fnmatch	GroupHead: Remove a redundant call to String.format()	преди 9 години
gitrepo	Fix wrong whitespaces.	преди 8 години
hooks	Fix pre-push hook to not set null remoteName as first argument	преди 8 години
ignore	[ignore rules] fix for handling unmatched '[' brackets	преди 8 години
internal	Scan loose ref before packed in case gc about to remove the loose	преди 8 години
lib	Merge branch 'master' into stable-4.3	преди 8 години
merge	Fix calling of clean/smudge filters from Checkout,MergeCommands	преди 8 години
nls	Drop warnings about unchecked casts in a few stable select places	преди 9 години
notes	Paths.pathCompare: Utility to sort paths from byte[]	преди 8 години
patch	Switch FileHeader.extractFileLines to TemporaryBuffer.Heap	преди 9 години
revplot	Use baseline instead of centerline in PlotRenderer	преди 9 години
revwalk	RevCommit: Better support invalid encoding headers	преди 8 години
storage	Don't use deprecated LockFile constructor	преди 8 години
submodule	containsGitModulesFile() should not crash on bare repository	преди 8 години
transport	Tests on Windows with URIish fail	преди 8 години
treewalk	Fix computation of id in WorkingTreeIterator with autocrlf and smudging	преди 8 години
util	Fix possible NPEs when reporting transport errors	преди 8 години