Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2017-01-19 19:28:12 -0500
committerMatthias Sohn2017-02-01 17:46:41 -0500
commit57b32833c43dd4589d7178695edf4d66568f1213 (patch)
treeb5a7c1cf5f0390af9d122da6925bdeacb7f6c55c /org.eclipse.egit.core.test/src
parentf78ba98dbd3e9ebfee49c2c5dcc6f75e8062d97e (diff)
downloadegit-57b32833c43dd4589d7178695edf4d66568f1213.tar.gz
egit-57b32833c43dd4589d7178695edf4d66568f1213.tar.xz
egit-57b32833c43dd4589d7178695edf4d66568f1213.zip
Auto-ignore the .metadata and .recommenders folders in the workspace
Auto-ignore the .metadata and .recommenders folders in the workspace if the workspace root is located in a git repository's working tree (which is not recommended). Bug: 332834 Change-Id: Ied46005417810edd9312d5563c501f9999002068 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core.test/src')
-rw-r--r--org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
index f8e8595e1..b23f9c854 100644
--- a/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
+++ b/org.eclipse.egit.core.test/src/org/eclipse/egit/core/test/op/IgnoreOperationTest.java
@@ -133,7 +133,8 @@ public class IgnoreOperationTest extends GitTestCase {
File ignoreFile = new File(rootFile, Constants.GITIGNORE_FILENAME);
String content = testUtils.slurpAndClose(ignoreFile.toURI().toURL()
.openStream());
- assertEquals("/" + project.getProject().getName() + "/\n", content);
+ assertEquals("/.metadata/\n/" + project.getProject().getName() + "/\n",
+ content);
assertTrue(operation.isGitignoreOutsideWSChanged());
}

Back to the top