From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 8 Feb 2022 23:32:10 +0000 (+0100)
Subject: Merge branch 'stable-5.13' into stable-6.0
X-Git-Tag: v6.1.0.202202221755-m3~13^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cec6db62af51a43e4c121f135a98de443ef0cd2c;p=jgit.git

Merge branch 'stable-5.13' into stable-6.0

* stable-5.13:
  Stop initCause throwing in readAdvertisedRefs

Change-Id: I94251601aa7fae9cc65164eaddcf16471874b11e
---

cec6db62af51a43e4c121f135a98de443ef0cd2c
diff --cc org.eclipse.jgit/.settings/.api_filters
index 0000000000,acceac05df..ec04c60edc
mode 000000,100644..100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,0 -1,35 +1,12 @@@
+ <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <component id="org.eclipse.jgit" version="2">
 -    <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
 -        <filter id="336658481">
++    <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException">
++        <filter id="1141899266">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
 -                <message_argument value="DEFAULT_SEARCH_FOR_REUSE_TIMEOUT"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/BasePackPushConnection.java" type="org.eclipse.jgit.transport.BasePackPushConnection">
 -        <filter id="338792546">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.BasePackPushConnection"/>
 -                <message_argument value="noRepository()"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/ProtocolV2Hook.java" type="org.eclipse.jgit.transport.ProtocolV2Hook">
 -        <filter id="404000815">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.ProtocolV2Hook"/>
 -                <message_argument value="onObjectInfo(ObjectInfoRequest)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
 -    <resource path="src/org/eclipse/jgit/transport/SshConstants.java" type="org.eclipse.jgit.transport.SshConstants">
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.11.1"/>
 -                <message_argument value="PUBKEY_ACCEPTED_ALGORITHMS"/>
++                <message_argument value="5.13"/>
++                <message_argument value="6.0"/>
++                <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+ </component>