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 年之前