mirrors/jgit - jgit - source @ dussan.org

Historia

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 vuotta sitten
..
api	Fix applying stash on other commit	10 vuotta sitten
diff	Fix DiffFormatter NPEs for DiffEntry without content change	11 vuotta sitten
dircache	Move base test classes to the junit bundle for reuse for Java 7 tests	11 vuotta sitten
events	Move base test classes to the junit bundle for reuse for Java 7 tests	11 vuotta sitten
fnmatch	Added characters to be escaped in file name patterns	11 vuotta sitten
ignore	Don't treat "/" as valid ignore pattern	10 vuotta sitten
internal/storage	Break up GCTest to run in parallel	10 vuotta sitten
lib	Fix handling of file/folder conflicts during a checkout	10 vuotta sitten
merge	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 vuotta sitten
nls	Move org.eclipse.jgit.pgm's resource bundle to internal package	11 vuotta sitten
notes	Move base test classes to the junit bundle for reuse for Java 7 tests	11 vuotta sitten
patch	Suppress boxing warnings where we know they are ok	11 vuotta sitten
revplot	Attempt to fix graph layout when new heads are introduced	10 vuotta sitten
revwalk	[findBugs] Remove nonsense call	10 vuotta sitten
storage/file	Remove hardcoded target/trash from test cases	10 vuotta sitten
submodule	Use absolute paths for file:// URIs in tests	10 vuotta sitten
test/resources	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 vuotta sitten
transport	Move SampleDataRepositoryTestCase to org.eclipse.jgit.test	10 vuotta sitten
treewalk	Fix bugs in TreeWalk#isPathSuffix used by PathSuffixFilter	11 vuotta sitten
util	Cache SimpleDateFormat in GitDateParser per locale	10 vuotta sitten