diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2022-08-16 17:00:43 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2022-08-16 17:00:43 -0400 |
| commit | ab3799be37834a0ab9ac394eae1fe7c2766ee516 (patch) | |
| tree | 154790ae124f37ad91a86a3d1a5eacf81e59a828 | |
| parent | b255eb0fb6ab9c7487423083e8df9b1e373bc37e (diff) | |
| parent | 7854122b921d089b5877a8a8ff527a82c499feba (diff) | |
| download | jgit-ab3799be37834a0ab9ac394eae1fe7c2766ee516.tar.gz jgit-ab3799be37834a0ab9ac394eae1fe7c2766ee516.zip | |
Merge changes Ib6689f54,I3b5c22ee
* changes:
Remove unused API problem filters
Add missing @since tag for RevCommit#parents introduced in 61b4d105e4
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 31 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java | 2 |
2 files changed, 2 insertions, 31 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index b517849555..11ca369326 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,28 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.jgit" version="2"> - <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException"> - <filter id="1141899266"> - <message_arguments> - <message_argument value="5.13"/> - <message_argument value="6.1"/> - <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/> - </message_arguments> - </filter> - </resource> - <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter"> - <filter id="403767336"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="UNSET_INT"/> - </message_arguments> - </filter> - <filter id="403804204"> - <message_arguments> - <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/> - <message_argument value="getIntInRange(Config, String, String, String, int, int, int)"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger"> <filter id="336658481"> <message_arguments> @@ -82,14 +59,6 @@ </message_arguments> </filter> </resource> - <resource path="src/org/eclipse/jgit/transport/PushConfig.java" type="org.eclipse.jgit.transport.PushConfig"> - <filter id="338722907"> - <message_arguments> - <message_argument value="org.eclipse.jgit.transport.PushConfig"/> - <message_argument value="PushConfig()"/> - </message_arguments> - </filter> - </resource> <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport"> <filter id="1141899266"> <message_arguments> diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 7a74e314f6..70490eec79 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -106,6 +106,8 @@ public class RevCommit extends RevObject { * Avoid accessing this field directly. Use method * {@link RevCommit#getParents()} instead. RevCommit does not allow parents * to be overridden and altering parent(s) is not supported. + * + * @since 6.3 */ protected RevCommit[] parents; |