mirrors/jgit - jgit - source @ dussan.org

History

Christian Halstrick af40635aba Fix handling of file/folder conflicts during a checkout JGit was not handling certain file/folder conflicts during a checkout correctly. This was reported by Axel Richard in http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg02358.html. This commit fixes this problem. Still JGit behaves intentionally different than native git. If HEAD contains a tree, and workingtree, Index and Merge contain a file with same content ... then JGit allows a conflict free checkout of Merge. Native git always complains that it doesn't want to overwrite local changes. But there is no need to update the working tree because Index and Merge are already equal. A shell script which shows how native git behaves can be found here. https://gist.github.com/chalstrick/7694959#file-gistfile1-sh Change-Id: Ifd6a68974d61cd4fa23bc575f3a40773db66cafc Signed-off-by: Christian Halstrick <christian.halstrick@sap.com>		10 years ago
..
AbbreviatedObjectIdTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	11 years ago
BranchConfigTest.java	Declare essentially static methods as static	11 years ago
BranchTrackingStatusTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
ConfigTest.java	Make sure SystemReader is reset after test is run	10 years ago
ConstantsEncodingTest.java	cleanup: use assertArrayEquals for assertion on arrays	11 years ago
DirCacheCheckoutMaliciousPathTest.java	testMaliciousPathEmpty fails on Windows	10 years ago
DirCacheCheckoutTest.java	Fix handling of file/folder conflicts during a checkout	10 years ago
IndexDiffTest.java	IndexDiff: Provide stage state for conflicting entries	11 years ago
IndexModificationTimesTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
MergeHeadMsgTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
ObjectCheckerTest.java	Suppress boxing warnings where we know they are ok	11 years ago
ObjectIdOwnerMapTest.java	ObjectIdOwnerMap: More lightweight map for ObjectIds	13 years ago
ObjectIdRefTest.java	Convert all JGit unit tests to JUnit 4	13 years ago
ObjectIdSubclassMapTest.java	ObjectIdSubclassMap: Support duplicate additions	13 years ago
ObjectIdTest.java	cleanup: Prefer assertEquals over assertTrue(....equals(...))	11 years ago
ObjectLoaderTest.java	Convert all JGit unit tests to JUnit 4	13 years ago
RacyGitTests.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
RefDatabaseConflictingNamesTest.java	Add getConflictingNames to RefDatabase	11 years ago
RefTest.java	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 years ago
ReflogConfigTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
ReflogResolveTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
RepositoryCacheTest.java	Fix failed tests when the tmp directory is a symlink	10 years ago
RepositoryResolveTest.java	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 years ago
SquashCommitMsgTest.java	Move base test classes to the junit bundle for reuse for Java 7 tests	11 years ago
SymbolicRefTest.java	Convert all JGit unit tests to JUnit 4	13 years ago
T0001_PersonIdentTest.java	Don't allow null name or e-mail in PersonIdent	11 years ago
T0002_TreeTest.java	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 years ago
ThreadSafeProgressMonitorTest.java	Skip main thread test in ThreadSafeProgressMonitor	11 years ago
ValidRefNameTest.java	Suppress boxing warnings where we know they are ok	11 years ago
empty.gitindex.dat	Initial JGit contribution to eclipse.org	14 years ago
sorttest.gitindex.dat	Initial JGit contribution to eclipse.org	14 years ago