Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2017-11-22 20:34:08 +0000
committerMatthias Sohn2017-11-22 20:34:08 +0000
commit3ac44f1b38d3a7628955b13abb1560340a041426 (patch)
treef0547803c456d31b34a9f540a9ecc41e2074e11b /org.eclipse.jgit/.settings
parent985e3c641491c06eabe210391c2582e749bb6acf (diff)
parent7608de5e5db51086c48e90a8d265d12ad965cba8 (diff)
downloadjgit-3ac44f1b38d3a7628955b13abb1560340a041426.tar.gz
jgit-3ac44f1b38d3a7628955b13abb1560340a041426.tar.xz
jgit-3ac44f1b38d3a7628955b13abb1560340a041426.zip
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5: Prepare 4.5.5-SNAPSHOT builds JGit v4.5.4.201711221230-r Fix LockFile semantics when running on NFS Honor trustFolderStats also when reading packed-refs Prepare 4.5.4-SNAPSHOT builds JGit v4.5.3.201708160445-r Change-Id: Ie9c8e0d9172c8d53f075c284bf2a9677980d8dfb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters64
1 files changed, 61 insertions, 3 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 2c27b051b0..c6af42ee28 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -1,10 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.jgit" version="2">
<resource path="META-INF/MANIFEST.MF">
- <filter comment="non-breaking addition of exception classes needed to cleanly fix error handling in PackFile" id="924844039">
+ <filter id="924844039">
<message_arguments>
- <message_argument value="4.5.2"/>
- <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>
</resource>

Back to the top