Move WorkTreeUpdater to merge package
This avoids making it public with the associated costs for backward compatibility guarantees. Change-Id: I888f313f3854deace8d4cd92f354a6ef0d3b5460
This commit is contained in:
parent
6ed4c074ca
commit
448052dc2e
|
@ -60,7 +60,6 @@
|
||||||
import org.eclipse.jgit.treewalk.filter.TreeFilter;
|
import org.eclipse.jgit.treewalk.filter.TreeFilter;
|
||||||
import org.eclipse.jgit.util.FS;
|
import org.eclipse.jgit.util.FS;
|
||||||
import org.eclipse.jgit.util.LfsFactory;
|
import org.eclipse.jgit.util.LfsFactory;
|
||||||
import org.eclipse.jgit.util.WorkTreeUpdater;
|
|
||||||
import org.eclipse.jgit.util.TemporaryBuffer;
|
import org.eclipse.jgit.util.TemporaryBuffer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
package org.eclipse.jgit.util;
|
package org.eclipse.jgit.merge;
|
||||||
|
|
||||||
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
|
import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@
|
||||||
import org.eclipse.jgit.lib.Repository;
|
import org.eclipse.jgit.lib.Repository;
|
||||||
import org.eclipse.jgit.treewalk.TreeWalk.OperationType;
|
import org.eclipse.jgit.treewalk.TreeWalk.OperationType;
|
||||||
import org.eclipse.jgit.treewalk.WorkingTreeOptions;
|
import org.eclipse.jgit.treewalk.WorkingTreeOptions;
|
||||||
|
import org.eclipse.jgit.util.LfsFactory;
|
||||||
import org.eclipse.jgit.util.LfsFactory.LfsInputStream;
|
import org.eclipse.jgit.util.LfsFactory.LfsInputStream;
|
||||||
import org.eclipse.jgit.util.io.EolStreamTypeUtil;
|
import org.eclipse.jgit.util.io.EolStreamTypeUtil;
|
||||||
|
|
||||||
|
@ -58,10 +59,8 @@
|
||||||
* You should use a single instance for all of your file changes. In case of an
|
* 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
|
* error, make sure your instance is released, and initiate a new one if
|
||||||
* necessary.
|
* necessary.
|
||||||
*
|
|
||||||
* @since 6.3
|
|
||||||
*/
|
*/
|
||||||
public class WorkTreeUpdater implements Closeable {
|
class WorkTreeUpdater implements Closeable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The result of writing the index changes.
|
* The result of writing the index changes.
|
Loading…
Reference in New Issue