diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-21 00:40:02 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-21 00:45:30 +0200 |
| commit | 06b40b95c2ac28595624e1672949d245aef11fe0 (patch) | |
| tree | a0b4772f3dfa5d91f2346de919962d5f3c453b0a /org.eclipse.jgit/.settings | |
| parent | 831da296d9c944bbea19789f2b88ebd477d00dd4 (diff) | |
| parent | 6456059795c951f2b9261d50dc33d5902a5fbb87 (diff) | |
| download | jgit-06b40b95c2ac28595624e1672949d245aef11fe0.tar.gz jgit-06b40b95c2ac28595624e1672949d245aef11fe0.zip | |
Merge branch 'stable-6.4' into stable-6.5
* stable-6.4:
Add missing since tag for SshBasicTestBase
Add missing since tag for SshTestHarness#publicKey2
Silence API errors
Prevent infinite loop rescanning the pack list on
PackMismatchException
Remove blank in maven.config
Change-Id: I89af76946014fb44bd64c20e2b01a53397768d90
Diffstat (limited to 'org.eclipse.jgit/.settings')
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index b00ad4b22f..1fbc01102b 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.9.1"/> + <message_argument value="isPermanent()"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.9.1"/> + <message_argument value="setPermanent(boolean)"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/lib/BatchingProgressMonitor.java" type="org.eclipse.jgit.lib.BatchingProgressMonitor"> <filter id="336695337"> <message_arguments> @@ -79,6 +93,12 @@ </filter> <filter id="1142947843"> <message_arguments> + <message_argument value="5.13.2"/> + <message_argument value="CONFIG_KEY_SKIPHASH"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> <message_argument value="6.1.1"/> <message_argument value="CONFIG_KEY_TRUST_PACKED_REFS_STAT"/> </message_arguments> @@ -150,6 +170,14 @@ </message_arguments> </filter> </resource> + <resource path="src/org/eclipse/jgit/revwalk/RevCommit.java" type="org.eclipse.jgit.revwalk.RevCommit"> + <filter id="1193279491"> + <message_arguments> + <message_argument value="6.5.1"/> + <message_argument value="buffer"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig"> <filter id="336658481"> <message_arguments> |