From: Matthias Sohn <matthias.sohn@sap.com>
Date: Fri, 5 Oct 2018 23:52:38 +0000 (+0200)
Subject: Merge branch 'stable-4.9' into stable-4.10
X-Git-Tag: v4.11.4.201810060650-r~2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c0a973657f13fa72e4be0f42c02969f98ac69641;p=jgit.git

Merge branch 'stable-4.9' into stable-4.10

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

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

c0a973657f13fa72e4be0f42c02969f98ac69641
diff --cc org.eclipse.jgit/.settings/.api_filters
index fdc1efc6ed,9bcc8213c7..d30eafebbc
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -17,7 -32,46 +17,23 @@@
              </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>
 -                <message_argument value="4.5"/>
 -                <message_argument value="4.9"/>
 -                <message_argument value="createNewFile(File)"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1141899266">
 -            <message_arguments>
 -                <message_argument value="4.5"/>
 -                <message_argument value="4.9"/>
 -                <message_argument value="supportsAtomicCreateNewFile()"/>
 -            </message_arguments>
 -        </filter>
          <filter id="1141899266">
              <message_arguments>
                  <message_argument value="4.7"/>