]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.7' into stable-4.8 05/138605/1
authorMatthias Sohn <matthias.sohn@sap.com>
Wed, 13 Mar 2019 00:16:28 +0000 (01:16 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 13 Mar 2019 00:16:28 +0000 (01:16 +0100)
* stable-4.7:
  Prepare 4.7.9-SNAPSHOT builds
  JGit v4.7.8.201903121755-r
  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: I1136eaa1590b225ceaf16ba7552af0374253a74e
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/util/FS.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java

index abc71b22f370145173dc59ee18e5bac235c6cbd1,9fa97b4e2588df37810e0517baccf40928b9179d..18ae9eae3a81121d3da39c56b45ac35c331cc38a
                  <message_argument value="supportsAtomicCreateNewFile()"/>
              </message_arguments>
          </filter>
 +        <filter id="1141899266">
 +            <message_arguments>
 +                <message_argument value="4.7"/>
 +                <message_argument value="4.8"/>
 +                <message_argument value="createNewFileAtomic(File)"/>
 +            </message_arguments>
 +        </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="4.5.6"/>
+                 <message_argument value="fileAttributes(File)"/>
+             </message_arguments>
+         </filter>
      </resource>
 +    <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$LockToken">
 +        <filter id="1141899266">
 +            <message_arguments>
 +                <message_argument value="4.7"/>
 +                <message_argument value="4.8"/>
 +                <message_argument value="LockToken"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
  </component>