mirrors/jgit - jgit - source @ dussan.org

Historie

Christian Halstrick 930cd43553 Fix merge-base calculation Fix JGits merge-base calculation in case of inconsistent commit times. JGit was potentially failing to compute correct merge-bases when the commit times where inconsistent (a parent commit was younger than a child commit). The code in MergeBaseGenerator was aware of the fact that sometimes the discovery of a merge base x can occur after the parents of x have been seen (see comment in #carryOntoOne()). But in the light of inconsistent commit times it was possible that these parents of a merge-base have already been returned as a merge-base. This commit fixes the bug by buffering all commits generated by MergeBaseGenerator. It is expected that this buffer will be small because the number of merge-bases will be small. Additionally a new flag is used to mark the ancestors of merge-bases. This allows to filter out the unwanted commits. Bug: 507584 Change-Id: I9cc140b784c3231b972bd2c3de61a789365237ab		před 7 roky
..
.settings	Change JGit minimum execution environment to JavaSE-1.8	před 7 roky
META-INF	Update JavaEWAH to 1.1.6	před 7 roky
exttst/org/eclipse/jgit	Add test case comparing CGit vs JGit ignore behavior for random patterns	před 8 roky
src/org/eclipse/jgit/lib	Annotate Sets#of with @SafeVarArgs to prevent heap pollution warning	před 7 roky
tst/org/eclipse/jgit	Fix merge-base calculation	před 7 roky
tst-rsrc	Fix symlink content comparison on MacOS in tree walk	před 7 roky
.classpath	Change JGit minimum execution environment to JavaSE-1.8	před 7 roky
.gitignore	Extend the FS class for Java7	před 11 roky
.project	Remove references to org.eclipse.jgit.java7	před 7 roky
BUCK	Upgrade buck to 7b7817c48f30687781040b2b82ac9218d5c4eaa4	před 7 roky
build.properties	Add missing dependency to slf4j-log4j bridge	před 7 roky
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	před 8 roky
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	před 8 roky
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	před 13 roky
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	před 8 roky
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	před 8 roky
plugin.properties	Fix plugin provider names to conform with release train requirement	před 11 roky
pom.xml	Prepare 4.6.0-SNAPSHOT builds	před 7 roky