diff options
| author | Robin Stocker <robin@nibor.org> | 2013-08-28 22:57:37 +0200 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-09-09 17:05:17 -0400 |
| commit | 52ab578cd7180d114e01f5c3584424537e3440e3 (patch) | |
| tree | a8df0658ee8d25559639e2207142483ccb6ccc13 | |
| parent | e10dd22749a19bdc61306895f9fbbf1f74bc6ba5 (diff) | |
| download | jgit-52ab578cd7180d114e01f5c3584424537e3440e3.tar.gz jgit-52ab578cd7180d114e01f5c3584424537e3440e3.zip | |
Don't treat "/" as valid ignore pattern
This matches the behavior of C Git.
Bug: 415767
Change-Id: Ifa6500f3f6a033da40c48287630b77c47b15f4a0
Signed-off-by: Robin Stocker <robin@nibor.org>
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java | 11 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java index 881b01c312..0076ba124d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java @@ -166,6 +166,17 @@ public class IgnoreNodeTest extends RepositoryTestCase { assertEntry(F, tracked, "src/a/b"); } + @Test + public void testNoPatterns() throws IOException { + writeIgnoreFile(".gitignore", "", " ", "# comment", "/"); + writeTrashFile("a/a", ""); + + beginWalk(); + assertEntry(F, tracked, ".gitignore"); + assertEntry(D, tracked, "a"); + assertEntry(F, tracked, "a/a"); + } + private void beginWalk() throws CorruptObjectException { walk = new TreeWalk(db); walk.addTree(new FileTreeIterator(db)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java index fb65e0ce34..2cddddbe11 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/ignore/IgnoreNode.java @@ -102,7 +102,7 @@ public class IgnoreNode { String txt; while ((txt = br.readLine()) != null) { txt = txt.trim(); - if (txt.length() > 0 && !txt.startsWith("#")) //$NON-NLS-1$ + if (txt.length() > 0 && !txt.startsWith("#") && !txt.equals("/")) //$NON-NLS-1$ //$NON-NLS-2$ rules.add(new IgnoreRule(txt)); } } |