]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-5.0' into stable-5.1 00/130500/4
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 6 Oct 2018 14:56:12 +0000 (16:56 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 6 Oct 2018 14:56:12 +0000 (16:56 +0200)
commitdff99a272a96777a445cf4e822ffc22067222ce9
tree06349d3a7eff369372dd15e41f9575805faa8da0
parent9dbb18291fc680ec9326b866f133b233093d800f
parent23ebbe5662f10a4b8ad47b1fb1cfe115e03d2ddd
Merge branch 'stable-5.0' into stable-5.1

* stable-5.0:
  Prepare 4.11.5-SNAPSHOT builds
  JGit v4.11.4.201810060650-r
  Fix configuration of maven-javadoc-plugin
  Prepare 4.9.7-SNAPSHOT builds
  JGit v4.9.6.201810051924-r
  Prepare 4.7.6-SNAPSHOT builds
  JGit v4.7.5.201810051826-r
  BaseReceivePack: Validate incoming .gitmodules files
  ObjectChecker: Report .gitmodules files found in the pack
  SubmoduleAddCommand: Reject submodule URIs that look like cli options

* Fix todos in SubmoduleAddTest

Change-Id: I53272081094b8948a40a1ce409af08b6ef330c1e
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java
org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
pom.xml