mirrors/jgit - jgit - source @ dussan.org

文件歷史

Robin Stocker 7dc8a4f089 Fix exception on conflicts with recursive merge When there are conflicts with a recursive merge, the conflicting paths are stored in unmergedPaths (field in ResolveMerger). Later, when the MergeResult is constructed in MergeCommand, getBaseCommit is called, which computes the merge base a second time. In case of RecursiveMerger, getBaseCommit merges the multiple merge bases into one. It does this not by creating a new ResolveMerger but instead calling mergeTrees. The problem with mergeTrees is that at the end, it checks if unmergedPaths is non-empty and returns false in that case. Because unmergedPaths was already non-empty because of the real merge, it thinks that there were conflicts when computing the merge base again, when there really were none. This can be fixed by storing the base commit when computing it and then returning that instead of computing it a second time. Note that another possible fix would be to just use a new ResolveMerger for merging the merge bases instead. This would also remove the need to remember the old value of dircache, inCore and workingTreeIterator (see RecursiveMerger#getBaseCommit). Bug: 419641 Change-Id: Ib2ebf4e177498c22a9098aa225e3cfcf16bbd958 Signed-off-by: Robin Stocker <robin@nibor.org>		10 年之前
..
.settings	Disable warning about assigning to parameter	11 年之前
META-INF	Don't import non-existing package org.eclipse.jgit.java7	10 年之前
exttst/org/eclipse/jgit/patch	Kill GitIndex	12 年之前
tst/org/eclipse/jgit	Fix exception on conflicts with recursive merge	10 年之前
tst-rsrc	Fix patch application WRT windows line endings.	11 年之前
.classpath	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	14 年之前
.gitignore	Extend the FS class for Java7	11 年之前
.project	Extend the FS class for Java7	11 年之前
build.properties	Partial revert "Switch build to Apache Felix maven-bundle-plugin"	14 年之前
org.eclipse.jgit.core--All-External-Tests (Java 6).launch	Use JUnit4 for tests	14 年之前
org.eclipse.jgit.core--All-External-Tests.launch	Use JUnit4 for tests	14 年之前
org.eclipse.jgit.core--All-Tests (Java 6).launch	Increase heap size for jgit tests	14 年之前
org.eclipse.jgit.core--All-Tests (Java 7).launch	Extend the FS class for Java7	11 年之前
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	14 年之前
plugin.properties	Fix plugin provider names to conform with release train requirement	11 年之前
pom.xml	Prepare 3.2.0-SNAPSHOT builds	10 年之前