mirrors/jgit - jgit - source @ dussan.org

履歴

Matthias Sohn 8b9623511f Use ANY_DIFF filter in ResolveMerger only for bare repositories As Chris pointed out change I822721c76c64e614f87a080ced2457941f53adcd slowed down merge since ANY_DIFF filter is much less efficient than the manual detection of diffs done in ResolveMerger.processEntry() since it avoids unnecessary filesystem calls using the git index. Hence only set the ANY_DIFF filter on bare repositories which don't have a working tree to scan. To test performance I used the setup described in Chris' comment on change I822721c76c64e614f87a080ced2457941f53adcd and modified ResolveMerger.mergeTrees() to not add the working tree in order to simulate merging in a bare repository. At least on Mac I couldn't detect a speedup, with and without the ANY_DIFF filter merge test takes an average 0.67sec. Change-Id: I17b3a06f369cee009490f54ad1a2deb6c145c7cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		9年前
..
.settings	Remove obsolete API warning filters to silence warnings	9年前
META-INF	Add repository name to failures in HTTP server log	9年前
findBugs	[findBugs] Silence warning about Transport initialization	11年前
resources/org/eclipse/jgit	Remove pack from list when file handle is stale	9年前
src/org/eclipse/jgit	Use ANY_DIFF filter in ResolveMerger only for bare repositories	9年前
.classpath	Set minimum required Java version to Java 7	9年前
.fbprefs	Initial JGit contribution to eclipse.org	14年前
.gitignore	Finish removing Apache Felix maven-bundle-plugin	14年前
.project	Revert "Hide Maven target directories from Eclipse"	14年前
about.html	Add missing about.html files to all shipped bundles	13年前
build.properties	Add "resources/" as a source folder	14年前
plugin.properties	Remove incubation marker	13年前
pom.xml	Merge branch 'stable-3.7'	9年前