summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/.settings
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2024-08-20 15:26:41 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2024-08-20 15:26:41 +0200
commitcb0935ab6dbcb2c54f0ea67585e608987c87284e (patch)
tree953dc5d10b6d4e2dd7d2fb021903e8aed1342dfe /org.eclipse.jgit/.settings
parent299a7348eb318a0199226c1e633cc46c659d76d3 (diff)
parente431a0d8712e88770bf0946f0ad70df9b92e4188 (diff)
downloadjgit-cb0935ab6dbcb2c54f0ea67585e608987c87284e.tar.gz
jgit-cb0935ab6dbcb2c54f0ea67585e608987c87284e.zip
Merge branch 'stable-6.10'
* stable-6.10: Update tycho to 4.0.8 Update org.eclipse.dash:license-tool-plugin to 1.1.0 Fix "Comparison of narrow type with wide type in loop condition" RepoProject: read the 'dest-branch' attribute of a project Make RepoProject#setUpstream public RepoCommand: Add error to ManifestErrorException RepoCommand: Copy manifest upstream into .gitmodules ref field RepoProject: read the "upstream" attribute of a project JGit v5.13.3.202401111512-r Change-Id: If67534f8954703e107e8477456325af3d868612c
Diffstat (limited to 'org.eclipse.jgit/.settings')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters19
1 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
new file mode 100644
index 0000000000..50a04d20f0
--- /dev/null
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.jgit" version="2">
+ <resource path="src/org/eclipse/jgit/gitrepo/RepoProject.java" type="org.eclipse.jgit.gitrepo.RepoProject">
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="7.0"/>
+ <message_argument value="6.10"/>
+ <message_argument value="getDestBranch()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="7.0"/>
+ <message_argument value="6.10"/>
+ <message_argument value="setDestBranch(String)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>