Merge branch 'stable-4.8' into stable-4.9

* stable-4.8:
  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

Change-Id: Ia7a826399d8d5b8a0eb7169b40e98a6f5c207a4c
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectCheckerTest.java
Simple merge

diff --cc org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/ReceivePackAdvertiseRefsHookTest.java
Simple merge

diff --cc org.eclipse.jgit/.settings/.api_filters
index e9511890fd53bdaeed190236bd037d88588c16f0,abc71b22f370145173dc59ee18e5bac235c6cbd1..9bcc8213c719e51d3f4795427078c1da784d1107
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -3,8 -3,8 +3,8 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
-                 <message_argument value="4.9.4"/>
 -                <message_argument value="4.8.1"/>
 -                <message_argument value="4.8.0"/>
++                <message_argument value="4.9.6"/>
 +                <message_argument value="4.9.0"/>
              </message_arguments>
          </filter>
      </resource>
@@@ -32,15 -32,22 +32,31 @@@
              </message_arguments>
          </filter>
      </resource>
+     <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
+         <filter id="1109393411">
+             <message_arguments>
+                 <message_argument value="4.7.5"/>
+                 <message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.7.5"/>
+                 <message_argument value="getGitsubmodules()"/>
+             </message_arguments>
+         </filter>
+     </resource>
 +    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
 +        <filter id="1141899266">
 +            <message_arguments>
 +                <message_argument value="3.5"/>
 +                <message_argument value="4.9"/>
 +                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
      <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
          <filter id="1141899266">
              <message_arguments>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectChecker.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
index 44abcd598bd0cccefca9ce09cc8b537c1d312207,14b683f017bd02a79fe99533ff5e6a63907c4f9a..72c8664177b05006d6afa3abbd734ff6bb29750e
--- 1/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
--- 2/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
@@@ -76,11 -77,16 +77,15 @@@ import org.eclipse.jgit.errors.PackProt
  import org.eclipse.jgit.errors.TooLargePackException;
  import org.eclipse.jgit.internal.JGitText;
  import org.eclipse.jgit.internal.storage.file.PackLock;
+ import org.eclipse.jgit.internal.submodule.SubmoduleValidator;
+ import org.eclipse.jgit.lib.AnyObjectId;
  import org.eclipse.jgit.lib.BatchRefUpdate;
  import org.eclipse.jgit.lib.Config;
 -import org.eclipse.jgit.lib.Config.SectionParser;
  import org.eclipse.jgit.lib.Constants;
+ import org.eclipse.jgit.lib.GitmoduleEntry;
  import org.eclipse.jgit.lib.NullProgressMonitor;
  import org.eclipse.jgit.lib.ObjectChecker;
+ import org.eclipse.jgit.lib.ObjectDatabase;
  import org.eclipse.jgit.lib.ObjectId;
  import org.eclipse.jgit.lib.ObjectIdSubclassMap;
  import org.eclipse.jgit.lib.ObjectInserter;