Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2010-12-08 16:59:18 -0500
committerChris Aniszczyk2010-12-08 17:07:07 -0500
commit526569fa0dad9f43cc17e33eaee3c58ab1917648 (patch)
tree102ca4d796635e57faf026c510cf15e7d00a8c29 /org.eclipse.egit.core.test
parentf405b61f180c2f281d2f0de17cfe524076ac741e (diff)
downloadegit-526569fa0dad9f43cc17e33eaee3c58ab1917648.tar.gz
egit-526569fa0dad9f43cc17e33eaee3c58ab1917648.tar.xz
egit-526569fa0dad9f43cc17e33eaee3c58ab1917648.zip
Adapt egit to jgit change Idb176736
JGit change Idb176736fa0dc97af372f1d652a94ecc72fb457c changed handling of WorkingTreeOptions and filemode breaking the egit build. Change-Id: Iee407b7bfb3c65df5c3562b3bdabb5637f04b481 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.egit.core.test')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
index ff7c53937..bc8a27759 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/AdaptableFileTreeIteratorTest.java
@@ -34,8 +34,6 @@ public class AdaptableFileTreeIteratorTest extends GitTestCase {
private Repository repository;
- private File repositoryRoot;
-
private File file;
@Before
@@ -43,7 +41,6 @@ public class AdaptableFileTreeIteratorTest extends GitTestCase {
super.setUp();
repository = new FileRepository(gitDir);
- repositoryRoot = repository.getWorkTree();
repository.create();
file = new File(project.getProject().getLocation().toFile(), "a.txt");
@@ -62,7 +59,7 @@ public class AdaptableFileTreeIteratorTest extends GitTestCase {
.getRoot();
final TreeWalk treeWalk = new TreeWalk(repository);
- treeWalk.addTree(new AdaptableFileTreeIterator(repositoryRoot, root));
+ treeWalk.addTree(new AdaptableFileTreeIterator(repository, root));
treeWalk.setRecursive(true);
final IFile eclipseFile = project.getProject().getFile(file.getName());

Back to the top