3c544647b7
When ResolveMerger finds a path where it has to do a content merge it will try the content merge and if that succeeds it'll add the newly produced content to the index. For the FileMode of this new index entry it blindly copies the FileMode it finds for that path in the common base tree. If by chance the common base tree does not contain this path it'll try to add FileMode 0 (MISSING) to the index. One could argue that this can't happen: how can the ResolveMerger successfully (with no conflicts) merge two contents if there is no common base? This was due to another bug in ResolveMerger. It failed to find out that for two files which differ only in the FileMode (e.g. 644 vs. 755) it should not try a content merge. Change-Id: I7a00fe1a6c610679be475cab8a3f8aa4c08811a1 Signed-off-by: Christian Halstrick <christian.halstrick@sap.com> Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> |
||
|---|---|---|
| .. | ||
| .settings | ||
| META-INF | ||
| exttst/org/eclipse/jgit/patch | ||
| tst/org/eclipse/jgit | ||
| tst-rsrc/org/eclipse/jgit | ||
| .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.launch | ||
| plugin.properties | ||
| pom.xml | ||