]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.5' into stable-4.6 16/140716/1 stable-4.6
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 15 Apr 2019 23:04:52 +0000 (01:04 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 16 Apr 2019 21:36:46 +0000 (23:36 +0200)
* stable-4.5:
  Prepare 4.5.8-SNAPSHOT builds
  JGit v4.5.7.201904151645-r
  Remember the cause for invalidating a packfile
  Fix API problem filters
  Fix pack files scan when filesnapshot isn't modified

Change-Id: I0b4eaa521ebdea83ab18c05915d691c07a575a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit/.settings/.api_filters

index c74a500aba3d5004fddf0cb3a40b2d89f09e9ac2,eb31d56ed12d41b49a318cac5fb12bf3650d3318..4a2663b34e9232cc5705d0c095cb2e196d4e097c
              </message_arguments>
          </filter>
      </resource>
+     <resource path="src/org/eclipse/jgit/errors/PackInvalidException.java" type="org.eclipse.jgit.errors.PackInvalidException">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.5.7"/>
+                 <message_argument value="PackInvalidException(File, Throwable)"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.5.7"/>
+                 <message_argument value="PackInvalidException(String, Throwable)"/>
+             </message_arguments>
+         </filter>
+     </resource>
 +    <resource path="src/org/eclipse/jgit/errors/UnsupportedPackIndexVersionException.java" type="org.eclipse.jgit.errors.UnsupportedPackIndexVersionException">
 +        <filter id="1108344834">
 +            <message_arguments>
 +                <message_argument value="4.5"/>
 +                <message_argument value="4.6"/>
 +                <message_argument value="org.eclipse.jgit.errors.UnsupportedPackIndexVersionException"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/errors/UnsupportedPackVersionException.java" type="org.eclipse.jgit.errors.UnsupportedPackVersionException">
 +        <filter id="1108344834">
 +            <message_arguments>
 +                <message_argument value="4.5"/>
 +                <message_argument value="4.6"/>
 +                <message_argument value="org.eclipse.jgit.errors.UnsupportedPackVersionException"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
      <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
          <filter id="336658481">
              <message_arguments>
                  <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
              </message_arguments>
          </filter>
 +        <filter id="1141899266">
 +            <message_arguments>
 +                <message_argument value="4.5"/>
 +                <message_argument value="4.6"/>
 +                <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
 +            </message_arguments>
 +        </filter>
      </resource>
      <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
-         <filter id="924844039">
-             <message_arguments>
-                 <message_argument value="4.5.6"/>
-                 <message_argument value="4.5.0"/>
-             </message_arguments>
-         </filter>
-     </resource>
-     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
-         <filter id="336658481">
-             <message_arguments>
-                 <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
-                 <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
-             </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.6"/>
 +                <message_argument value="createNewFile(File)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1141899266">
 +            <message_arguments>
 +                <message_argument value="4.5"/>
 +                <message_argument value="4.6"/>
 +                <message_argument value="supportsAtomicCreateNewFile()"/>
 +            </message_arguments>
 +        </filter>
          <filter id="1142947843">
              <message_arguments>
                  <message_argument value="4.5.6"/>