]> source.dussan.org Git - jgit.git/commitdiff
Silence API error raised for removed BranchRebaseMode#PRESERVE 70/200370/1
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 6 Mar 2023 20:39:42 +0000 (21:39 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Mon, 6 Mar 2023 20:39:42 +0000 (21:39 +0100)
It was replaced by MERGES to match C git which did that in 2.34.

Change-Id: Ib6a33b4a3650345bf0f9d3726dd9e14c5797e836

org.eclipse.jgit/.settings/.api_filters

index e215f7aa3f562a6675ab12260724a4b52b6f5ea4..b00ad4b22f7be3da89118c655b47e7cf92badf05 100644 (file)
             </message_arguments>
         </filter>
     </resource>
+    <resource path="src/org/eclipse/jgit/lib/BranchConfig.java" type="org.eclipse.jgit.lib.BranchConfig$BranchRebaseMode">
+        <filter id="372293724">
+            <message_arguments>
+                <message_argument value="org.eclipse.jgit.lib.BranchConfig.BranchRebaseMode"/>
+                <message_argument value="PRESERVE"/>
+            </message_arguments>
+        </filter>
+    </resource>
     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
         <filter id="1142947843">
             <message_arguments>