Christian Halstrick 2bd3556e7e Fix RecursiveMerger in case of multiple, independent base commits ... When RecursiveMerger found that there are multiple base-commits for the commits to be merged it tries to temporarily merge the base commits. But if these base commits have no common predecessor there was a bug in JGit leading to a NPE. This commit fixes this by enforcing that an empty tree is used as base when merging two unrelated base commits. This logic was already there when merging two commits which have no common predecessor (ThreeWayMerger.mergeBase()). But the code which was computing a new temporary base commit in case of criss-cross merges didn't take care to pick an empty tree when no common predecessor can be found. Bug: 462671 Change-Id: Ibd96302f5f81383f36d3b1e3edcbf5822147b1a4		2015-03-25 10:49:58 +01:00
..
.settings	Merge bundle org.eclipse.jgit.java7 into org.eclipse.jgit	2015-03-23 14:23:07 +01:00
META-INF	Refactored pre-commit hook to make it less invasive.	2015-03-02 15:33:30 +01:00
findBugs	[findBugs] Silence warning about Transport initialization	2012-09-14 00:01:47 +02:00
resources/org/eclipse/jgit	Revert "CommitBuilder should check for duplicate parents"	2015-03-18 16:26:05 -07:00
src/org/eclipse/jgit	Fix RecursiveMerger in case of multiple, independent base commits	2015-03-25 10:49:58 +01:00
.classpath	Set minimum required Java version to Java 7	2015-02-09 14:11:50 +01:00
.fbprefs	Initial JGit contribution to eclipse.org	2009-09-29 16:47:03 -07:00
.gitignore	Finish removing Apache Felix maven-bundle-plugin	2010-01-12 11:46:55 -08:00
.project	Revert "Hide Maven target directories from Eclipse"	2010-08-28 09:50:50 +02:00
about.html	Add missing about.html files to all shipped bundles	2011-06-08 21:51:51 +02:00
build.properties	Add "resources/" as a source folder	2010-06-05 14:39:27 +02:00
plugin.properties	Remove incubation marker	2011-05-31 22:53:53 +02:00
pom.xml	Prepare 3.7.1-SNAPSHOT builds	2015-02-27 01:41:30 +01:00