diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-06 21:39:42 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-06 21:39:42 +0100 |
| commit | 9be2b7f8a885926fa3d4f6e444223034106e6711 (patch) | |
| tree | cc996771560ef5e143f0ef15751f1df2c49bf746 | |
| parent | ec1dcfe500d90841432666f0cc6aac212be3831f (diff) | |
| download | jgit-9be2b7f8a885926fa3d4f6e444223034106e6711.tar.gz jgit-9be2b7f8a885926fa3d4f6e444223034106e6711.zip | |
Silence API error raised for removed BranchRebaseMode#PRESERVE
It was replaced by MERGES to match C git which did that in 2.34.
Change-Id: Ib6a33b4a3650345bf0f9d3726dd9e14c5797e836
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index e215f7aa3f..b00ad4b22f 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -50,6 +50,14 @@ </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> |