mirrors/jgit - jgit - source @ dussan.org

Verlauf

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		vor 7 Jahren
..
api	Organize imports	vor 7 Jahren
attributes	Add Attribute Macro Expansion	vor 8 Jahren
diff	Deprecate SafeBufferedOutputStream	vor 7 Jahren
dircache	DirCacheBasicTest: Open ObjectInserter.Formatter in try-with-resource	vor 8 Jahren
events	Move base test classes to the junit bundle for reuse for Java 7 tests	vor 11 Jahren
fnmatch	FileNameMatcherTest: Use Character.valueOf rather than new Character	vor 7 Jahren
gitrepo	Organize imports	vor 7 Jahren
ignore	Ignore trailing spaces in directory rule patterns	vor 7 Jahren
indexdiff	Fix symlink content comparison on MacOS in tree walk	vor 7 Jahren
internal/storage	Deprecate SafeBufferedOutputStream	vor 7 Jahren
junit	Clarify the semantics of DfsRefDatabase#compareAndPut	vor 7 Jahren
lib	Organize imports	vor 7 Jahren
merge	Organize imports	vor 7 Jahren
nls	Move console classes to pgm bundle	vor 9 Jahren
notes	NoteMapTest: Add missing @Test annotations	vor 7 Jahren
patch	Organize imports	vor 7 Jahren
revplot	Revert "CommitBuilder should check for duplicate parents"	vor 9 Jahren
revwalk	Fix merge-base calculation	vor 7 Jahren
storage/file	Remove hardcoded target/trash from test cases	vor 10 Jahren
submodule	SubmoduleAddTest: Open Git in try-with-resource	vor 8 Jahren
symlinks	SymlinksTest: Open git and TreeWalk in try-with-resource	vor 8 Jahren
test/resources	Fix loop in auto gc	vor 7 Jahren
transport	Organize imports	vor 7 Jahren
treewalk	Use FS#lastModified instead of File#lastModified	vor 7 Jahren
util	Organize imports	vor 7 Jahren