]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.5' into stable-4.6 93/138593/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 12 Mar 2019 20:01:55 +0000 (21:01 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 12 Mar 2019 21:26:58 +0000 (22:26 +0100)
* stable-4.5:
  Prepare 4.5.7-SNAPSHOT builds
  JGit v4.5.6.201903121547-r
  Check for packfile validity and fd before reading
  Move throw of PackInvalidException outside the catch
  Use FileSnapshot to get lastModified on PackFile
  Include size when comparing FileSnapshot
  Do not reuse packfiles when changed on filesystem
  Silence API warnings for new API introduced for fixes

Change-Id: I029e1797447e6729de68bd89d4d69b324dbb3f5f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

index c6af42ee281a378d5c8ea1b9f256a1a4a9abc356,fe83211ebc64d997eb65d8479047c66bb2e78784..c74a500aba3d5004fddf0cb3a40b2d89f09e9ac2
@@@ -3,67 -3,31 +3,89 @@@
      <resource path="META-INF/MANIFEST.MF">
          <filter id="924844039">
              <message_arguments>
 -                <message_argument value="4.5.4"/>
 -                <message_argument value="4.5.0"/>
 +                <message_argument value="4.6.2"/>
 +                <message_argument value="4.6.0"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/errors/NoPackSignatureException.java" type="org.eclipse.jgit.errors.NoPackSignatureException">
 +        <filter id="1108344834">
 +            <message_arguments>
 +                <message_argument value="4.5"/>
 +                <message_argument value="4.6"/>
 +                <message_argument value="org.eclipse.jgit.errors.NoPackSignatureException"/>
 +            </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="org.eclipse.jgit.lib.ConfigConstants"/>
 +                <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="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="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="1142947843">
+             <message_arguments>
+                 <message_argument value="4.5.6"/>
+                 <message_argument value="fileAttributes(File)"/>
+             </message_arguments>
+         </filter>
      </resource>
  </component>