diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-16 01:04:52 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-04-16 23:36:46 +0200 |
| commit | 422f030d29e24d4505cdb82241d0933652d06ba6 (patch) | |
| tree | b767536ddc27d5985bdd4451130c1653c3bcd88a /org.eclipse.jgit/.settings | |
| parent | d96eb8b3e6bf7cca71ee166fa669d0a60eaa0d6c (diff) | |
| parent | 0291b2eaf85ef976bd1a4afba8bd716d3f2e8fdc (diff) | |
| download | jgit-422f030d29e24d4505cdb82241d0933652d06ba6.tar.gz jgit-422f030d29e24d4505cdb82241d0933652d06ba6.zip | |
Merge branch 'stable-4.5' into stable-4.6stable-4.6
* stable-4.5:
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: I0b4eaa521ebdea83ab18c05915d691c07a575a7d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index c74a500aba..4a2663b34e 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -17,6 +17,20 @@ </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/errors/UnsupportedPackIndexVersionException.java" type="org.eclipse.jgit.errors.UnsupportedPackIndexVersionException"> <filter id="1108344834"> <message_arguments> @@ -65,22 +79,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"/> |