diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-07 16:41:06 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-07 16:41:19 +0100 |
| commit | 228e4de4841a694bf55ff38212822fca46b7b080 (patch) | |
| tree | b2e1c02a4f9a864cc9a47aba3ddad083218d3cb4 /org.eclipse.jgit | |
| parent | 0687c73a12b5157c350de430f62ea8243d813e19 (diff) | |
| parent | c6b979444b671f013f630241f84fba7983b540b6 (diff) | |
| download | jgit-228e4de4841a694bf55ff38212822fca46b7b080.tar.gz jgit-228e4de4841a694bf55ff38212822fca46b7b080.zip | |
Merge branch 'stable-6.5'
* stable-6.5:
Rerun flaky tests 3 times
Prepare 6.5.1-SNAPSHOT builds
JGit v6.5.0.202303070854-r
Ignore generated org.eclipse.jgit.benchmarks/dependency-reduced-pom.xml
[sshd] Fix calculation of timeout in AbstractClientProxyConnector
Silence API error raised for removed BranchRebaseMode#PRESERVE
Change-Id: Ie615980c81371ee26b2395e67e026bbd17422fbd
Diffstat (limited to 'org.eclipse.jgit')
| -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> |