]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.6' into stable-4.7 00/138600/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 12 Mar 2019 21:39:53 +0000 (22:39 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 12 Mar 2019 21:39:53 +0000 (22:39 +0100)
* stable-4.6:
  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: I3d1544d034783fe0fa1385dfe9b03ad8e9247c63
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/ObjectDirectory.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java

index 10836633272088095413d51282e7c8685915955e,c74a500aba3d5004fddf0cb3a40b2d89f09e9ac2..9fa97b4e2588df37810e0517baccf40928b9179d
                  <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>
index 8d4e5e52af74ea568a481265ce3b25c5d1c2374e,4a2a2d6f3da07f5c9e713703010b38cd3134dee4..183bf460c564a45d1d344af8e7a5facb6edfbb82
@@@ -53,8 -52,7 +53,9 @@@ import java.io.InputStreamReader
  import java.io.OutputStream;
  import java.io.PrintStream;
  import java.nio.charset.Charset;
 +import java.nio.file.Files;
 +import java.nio.file.Path;
+ import java.nio.file.attribute.BasicFileAttributes;
  import java.security.AccessController;
  import java.security.PrivilegedAction;
  import java.text.MessageFormat;