jgit/pgm at 59b96549a6518876e49bb5dbf1aa2b63e3f759c7 - jgit

纯java实现的git操作库。

Christian Halstrick 5fe44ed3ee Fix DirCacheCheckout to return CheckoutConflictException Problem occurs when the checkout wants to create a file 'd/f' but the workingtree contains a dirty file 'd'. In order to create d/f the file 'd' would have to be deleted and since the file is dirty that content would be lost. This should lead to a CheckoutConflictException for d/f when failOnConflict was set to true. This fix also changes jgit checkout semantics to be more like native gits checkout semantics. If during a checkout jgit wants to delete a folder but finds that the working tree contains a dirty file at this path then JGit will now throw an exception instead of silently keeping the dirty file. Like in this example: git init touch b git add b git commit -m addB mkdir a touch a/c git add a/c git commit -m addAC rm -fr a touch a git checkout HEAD~ Change-Id: I9089123179e09dd565285d50b0caa308d290cccd Signed-off-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de> Also-by: Rüdiger Herrmann <ruediger.herrmann@gmx.de>		9 years ago
..
AddTest.java	…
ArchiveTest.java	…
BranchTest.java	…
CLIGitCommandTest.java	…
CheckoutTest.java	Fix DirCacheCheckout to return CheckoutConflictException	9 years ago
CloneTest.java	Add missing @Test annotations	9 years ago
CommitAndLogTest.java	…
CommitTest.java	…
ConfigTest.java	…
DescribeTest.java	…
FetchTest.java	…
InitTest.java	JGit CLI: allow to call git init with specific directory	9 years ago
LsRemoteTest.java	…
MergeTest.java	…
ReflogTest.java	ReflogTest: Open Git instances in try-with-resource	9 years ago
RemoteTest.java	…
RepoTest.java	RepoTest: Open Git in try-with-resources	9 years ago
ResetTest.java	…
StatusTest.java	…
TagTest.java	…