aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-08-14 05:43:39 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2022-08-14 05:43:39 -0400
commit1745131addfcb367b1b2ebfd167bfe155443d210 (patch)
tree9716967abb07c94e1dbbc92ab4bc0ed9977f5372 /org.eclipse.jgit
parentd9c0629ffe45ba96f853672268c391dd7caa82fe (diff)
parent2417c9f0e4c863f5adae41b66744f955175487bc (diff)
downloadjgit-1745131addfcb367b1b2ebfd167bfe155443d210.tar.gz
jgit-1745131addfcb367b1b2ebfd167bfe155443d210.zip
Merge "Fix API errors caused by 23a71696cd"
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/.settings/.api_filters38
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java7
3 files changed, 41 insertions, 6 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters
index 1c283e7613..b517849555 100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@ -24,22 +24,52 @@
</filter>
</resource>
<resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
- <filter id="338792546">
+ <filter id="336658481">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+ <message_argument value="workTreeUpdater"/>
+ </message_arguments>
+ </filter>
+ <filter id="338755678">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+ <message_argument value="builder"/>
+ </message_arguments>
+ </filter>
+ <filter id="338755678">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+ <message_argument value="implicitDirCache"/>
+ </message_arguments>
+ </filter>
+ <filter id="338755678">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+ <message_argument value="toBeCheckedOut"/>
+ </message_arguments>
+ </filter>
+ <filter id="338755678">
+ <message_arguments>
+ <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
+ <message_argument value="toBeDeleted"/>
+ </message_arguments>
+ </filter>
+ <filter id="338755678">
<message_arguments>
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
- <message_argument value="addCheckoutMetadata(String, Attributes)"/>
+ <message_argument value="workingTreeOptions"/>
</message_arguments>
</filter>
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
- <message_argument value="addToCheckout(String, DirCacheEntry, Attributes)"/>
+ <message_argument value="addCheckoutMetadata(Map&lt;String,DirCacheCheckout.CheckoutMetadata&gt;, String, Attributes)"/>
</message_arguments>
</filter>
<filter id="338792546">
<message_arguments>
<message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
- <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean, Attributes)"/>
+ <message_argument value="cleanUp()"/>
</message_arguments>
</filter>
</resource>
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 949ab5f449..ab82dd0c30 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -133,6 +133,8 @@ public class ResolveMerger extends ThreeWayMerger {
/**
* Handler for repository I/O actions.
+ *
+ * @since 6.3
*/
protected WorkTreeUpdater workTreeUpdater;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
index f3531a6d1f..fb0b33a042 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
@@ -58,8 +58,11 @@ import org.eclipse.jgit.util.io.EolStreamTypeUtil;
/**
* Handles work tree updates on both the checkout and the index.
* <p>
- * You should use a single instance for all of your file changes. In case of an error, make sure
- * your instance is released, and initiate a new one if necessary.
+ * You should use a single instance for all of your file changes. In case of an
+ * error, make sure your instance is released, and initiate a new one if
+ * necessary.
+ *
+ * @since 6.3
*/
public class WorkTreeUpdater implements Closeable {