af40635aba
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> |
||
|---|---|---|
| .. | ||
| .settings | ||
| META-INF | ||
| exttst/org/eclipse/jgit/patch | ||
| tst/org/eclipse/jgit | ||
| tst-rsrc | ||
| .classpath | ||
| .gitignore | ||
| .project | ||
| build.properties | ||
| org.eclipse.jgit.core--All-External-Tests (Java 6).launch | ||
| org.eclipse.jgit.core--All-External-Tests.launch | ||
| org.eclipse.jgit.core--All-Tests (Java 6).launch | ||
| org.eclipse.jgit.core--All-Tests (Java 7).launch | ||
| org.eclipse.jgit.core--All-Tests.launch | ||
| plugin.properties | ||
| pom.xml | ||