Browse Source

Removed unused repo field in WorkDirCheckout

Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
stable-0.9
Robin Rosenberg 15 years ago
parent
commit
292fe88c50
  1. 4
      org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/WorkDirCheckout.java

@ -64,8 +64,6 @@ import org.eclipse.jgit.lib.GitIndex.Entry;
* Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}. * Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}.
*/ */
public class WorkDirCheckout { public class WorkDirCheckout {
Repository repo;
File root; File root;
GitIndex index; GitIndex index;
@ -87,7 +85,6 @@ public class WorkDirCheckout {
WorkDirCheckout(Repository repo, File workDir, WorkDirCheckout(Repository repo, File workDir,
GitIndex oldIndex, GitIndex newIndex) throws IOException { GitIndex oldIndex, GitIndex newIndex) throws IOException {
this.repo = repo;
this.root = workDir; this.root = workDir;
this.index = oldIndex; this.index = oldIndex;
this.merge = repo.mapTree(newIndex.writeTree()); this.merge = repo.mapTree(newIndex.writeTree());
@ -103,7 +100,6 @@ public class WorkDirCheckout {
*/ */
public WorkDirCheckout(Repository repo, File root, public WorkDirCheckout(Repository repo, File root,
GitIndex index, Tree merge) { GitIndex index, Tree merge) {
this.repo = repo;
this.root = root; this.root = root;
this.index = index; this.index = index;
this.merge = merge; this.merge = merge;

Loading…
Cancel
Save