motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Fix API errors caused by 23a71696cd"

This commit is contained in:
Matthias Sohn 2022-08-14 05:43:39 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent d9c0629ffe 2417c9f0e4
commit 1745131add
3 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
org.eclipse.jgit/.settings/.api_filters
View File

@ -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="addCheckoutMetadata(String, Attributes)"/>
<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="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>

2
org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
View File

@ -133,6 +133,8 @@ public enum MergeFailureReason {
/**
* Handler for repository I/O actions.
*
* @since 6.3
*/
protected WorkTreeUpdater workTreeUpdater;

7
org.eclipse.jgit/src/org/eclipse/jgit/util/WorkTreeUpdater.java
View File

@ -58,8 +58,11 @@
/**
* 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 {