]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-4.9' into stable-4.10 39/140839/1
authorMatthias Sohn <matthias.sohn@sap.com>
Thu, 18 Apr 2019 16:42:45 +0000 (18:42 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Thu, 18 Apr 2019 16:43:01 +0000 (18:43 +0200)
* stable-4.9:
  Prepare 4.9.11-SNAPSHOT builds
  JGit v4.9.10.201904181027-r
  Prepare 4.7.10-SNAPSHOT builds
  JGit v4.7.9.201904161809-r
  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: I94c9e6300b5f77b185ec6661fa76f0c74a5fc2a9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java

index cae17b1de587ec09a225d22c8d1e3113a00358df,1630c3fcddae1b82513a25c9dd995a1cb20a41b2..726d670311bdb0d72f2f9ca831112fe9f422c465
@@@ -8,6 -8,35 +8,20 @@@
              </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.9"/>
 -                <message_argument value="CONFIG_KEY_SUPPORTSATOMICFILECREATION"/>
 -            </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/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
          <filter id="1141899266">
              <message_arguments>