jgit/org.eclipse.jgit.test at f7244b81ccb8dbfc9b2219fc9aa8a4cb15ced52c - jgit

纯java实现的git操作库。

David Turner be2a8ed63b Basic submodule merge handling This doesn't handle the really hard thing, which is merging spurious conflicts inside .gitmodules files. That's OK: git.git doesn't either. Users can resolve the conflict themselves and then commit the merge. Previously, jgit would crash when attempting to merge conflicting submodule changes. Even if there was no conflict, after a merge which adds submodules, the repository would have been missing empty directories for newly-added submodules. This patch fixes the crash, and adds the empty directories where necessary. It ensures that the index is in a conflicted state when submodule changes conflict. Reported-by: Alexey Korobkov Bug: 494551 Change-Id: I79db6798c2bdcc1159b5b2589b02da198dc906a1 Signed-off-by: David Turner <dturner@twosigma.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>		7 years ago
..
.settings	Ignore warning for minor version change without API change	7 years ago
META-INF	Fix version of slf4j in manifest files	7 years ago
exttst/org/eclipse/jgit	Use constants from StandardCharsets instead of hard-coded strings	7 years ago
src/org/eclipse/jgit	Send a detailed event on working tree modifications	7 years ago
tst/org/eclipse/jgit	Basic submodule merge handling	7 years ago
tst-rsrc	Support -merge attribute in binary macro	8 years ago
.classpath	Change JGit minimum execution environment to JavaSE-1.8	8 years ago
.gitignore	Extend the FS class for Java7	12 years ago
.project	Remove references to org.eclipse.jgit.java7	9 years ago
BUILD	Format BUILD files with buildifier	7 years ago
build.properties	Add missing dependency to slf4j-log4j bridge	8 years ago
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	9 years ago
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	9 years ago
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	15 years ago
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	9 years ago
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	9 years ago
plugin.properties	Fix plugin provider names to conform with release train requirement	12 years ago
pom.xml	Prepare 4.11.0-SNAPSHOT builds	7 years ago
tests.bzl	Add dependency to jsch for OpenSshConfigTest to bazel build	7 years ago