mirrors/jgit - jgit - source @ dussan.org

Verlauf

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