Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Goubet2014-01-31 04:52:12 -0500
committerLaurent Goubet2014-02-03 09:28:00 -0500
commitd124b61dce551ef44498a1b58f4eab396b116db7 (patch)
treeabc8fb3f06f687dea80901ff55d1aeece4e2717e
parentf03564974688d6efe98d66b4f8a793cf12c1580e (diff)
downloadorg.eclipse.emf.compare-d124b61dce551ef44498a1b58f4eab396b116db7.tar.gz
org.eclipse.emf.compare-d124b61dce551ef44498a1b58f4eab396b116db7.tar.xz
org.eclipse.emf.compare-d124b61dce551ef44498a1b58f4eab396b116db7.zip
fixing git tests failures
Change-Id: Ic56f6156d3ad11a8a02e7eacf4f0db5e0a10c610 Conflicts: plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
index 8eb77de06..fc4b4cb66 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/egit/CompareGitTestCase.java
@@ -62,7 +62,7 @@ public class CompareGitTestCase {
final MockSystemReader mockSystemReader = new MockSystemReader();
SystemReader.setInstance(mockSystemReader);
mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY, ResourcesPlugin.getWorkspace()
- .getRoot().getLocation().toFile().getAbsoluteFile().toString());
+ .getRoot().getLocation().toFile().getParentFile().getAbsoluteFile().toString());
project = new TestProject();
gitDir = new File(project.getProject().getWorkspace().getRoot().getRawLocation().toFile(),
Constants.DOT_GIT);

Back to the top