mirrors/jgit - jgit - source @ dussan.org

История

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>		6 лет назад
..
.settings	Ignore warning for minor version change without API change	6 лет назад
META-INF	Fix version of slf4j in manifest files	6 лет назад
exttst/org/eclipse/jgit	Use constants from StandardCharsets instead of hard-coded strings	6 лет назад
src/org/eclipse/jgit	Send a detailed event on working tree modifications	6 лет назад
tst/org/eclipse/jgit	Basic submodule merge handling	6 лет назад
tst-rsrc	Support -merge attribute in binary macro	7 лет назад
.classpath	Change JGit minimum execution environment to JavaSE-1.8	7 лет назад
.gitignore	Extend the FS class for Java7	11 лет назад
.project	Remove references to org.eclipse.jgit.java7	7 лет назад
BUILD	Format BUILD files with buildifier	6 лет назад
build.properties	Add missing dependency to slf4j-log4j bridge	7 лет назад
org.eclipse.jgit.core--All-Tests (Java 8) (de).launch	Fixed few locale dependent pgm tests	8 лет назад
org.eclipse.jgit.core--All-Tests (Java 8).launch	Fix classpath of test launch configurations	8 лет назад
org.eclipse.jgit.core--All-Tests.launch	Use JUnit4 for tests	14 лет назад
org.eclipse.jgit.test-WalkEncryptionTest-Proxy.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	8 лет назад
org.eclipse.jgit.test-WalkEncryptionTest.launch	Adding AES Walk Encryption support in http://www.jets3t.org/ mode	8 лет назад
plugin.properties	Fix plugin provider names to conform with release train requirement	11 лет назад
pom.xml	Prepare 4.11.0-SNAPSHOT builds	6 лет назад
tests.bzl	Add dependency to jsch for OpenSshConfigTest to bazel build	6 лет назад