Removed unused repo field in WorkDirCheckout
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
This commit is contained in:
parent
ce56c5dcc9
commit
292fe88c50
|
@ -64,8 +64,6 @@
|
|||
* Three-way merges are no performed. See {@link #setFailOnConflict(boolean)}.
|
||||
*/
|
||||
public class WorkDirCheckout {
|
||||
Repository repo;
|
||||
|
||||
File root;
|
||||
|
||||
GitIndex index;
|
||||
|
@ -87,7 +85,6 @@ public void setFailOnConflict(boolean failOnConflict) {
|
|||
|
||||
WorkDirCheckout(Repository repo, File workDir,
|
||||
GitIndex oldIndex, GitIndex newIndex) throws IOException {
|
||||
this.repo = repo;
|
||||
this.root = workDir;
|
||||
this.index = oldIndex;
|
||||
this.merge = repo.mapTree(newIndex.writeTree());
|
||||
|
@ -103,7 +100,6 @@ public void setFailOnConflict(boolean failOnConflict) {
|
|||
*/
|
||||
public WorkDirCheckout(Repository repo, File root,
|
||||
GitIndex index, Tree merge) {
|
||||
this.repo = repo;
|
||||
this.root = root;
|
||||
this.index = index;
|
||||
this.merge = merge;
|
||||
|
|
Loading…
Reference in New Issue