motiejus
/
jgit
1
Fork 0
Code Releases Activity

Consider original file mode while checking parent ignore rules 

The WorkingTreeIterator.isEntryIgnored() should use originally requested
file mode while descending to the file tree root and checking ignore
rules. Original code asking isEntryIgnored() on a file was using
directory mode instead if the .gitignore was not located in the same
directory.

Bug: 473506
Change-Id: I9f16ba714c3ea9e6585e9c11623270dbdf4fb1df
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
This commit is contained in:
Andrey Loskutov 2015-07-24 23:26:43 +02:00
parent 6bc6e9520e
commit 63bc1d862d
2 changed files with 57 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
org.eclipse.jgit.test/tst/org/eclipse/jgit/ignore/IgnoreNodeTest.java
View File

@ -354,6 +354,56 @@ public void testSlashOnlyMatchesDirectory() throws IOException {
endWalk();
}
@Test
public void testSlashMatchesDirectory() throws IOException {
writeIgnoreFile(".gitignore", "out2/");
writeTrashFile("out1/out1", "");
writeTrashFile("out1/out2", "");
writeTrashFile("out2/out1", "");
writeTrashFile("out2/out2", "");
beginWalk();
assertEntry(F, tracked, ".gitignore");
assertEntry(D, tracked, "out1");
assertEntry(F, tracked, "out1/out1");
assertEntry(F, tracked, "out1/out2");
assertEntry(D, ignored, "out2");
assertEntry(F, ignored, "out2/out1");
assertEntry(F, ignored, "out2/out2");
endWalk();
}
@Test
public void testWildcardWithSlashMatchesDirectory() throws IOException {
writeIgnoreFile(".gitignore", "out2*/");
writeTrashFile("out1/out1.txt", "");
writeTrashFile("out1/out2", "");
writeTrashFile("out1/out2.txt", "");
writeTrashFile("out1/out2x/a", "");
writeTrashFile("out2/out1.txt", "");
writeTrashFile("out2/out2.txt", "");
writeTrashFile("out2x/out1.txt", "");
writeTrashFile("out2x/out2.txt", "");
beginWalk();
assertEntry(F, tracked, ".gitignore");
assertEntry(D, tracked, "out1");
assertEntry(F, tracked, "out1/out1.txt");
assertEntry(F, tracked, "out1/out2");
assertEntry(F, tracked, "out1/out2.txt");
assertEntry(D, ignored, "out1/out2x");
assertEntry(F, ignored, "out1/out2x/a");
assertEntry(D, ignored, "out2");
assertEntry(F, ignored, "out2/out1.txt");
assertEntry(F, ignored, "out2/out2.txt");
assertEntry(D, ignored, "out2x");
assertEntry(F, ignored, "out2x/out1.txt");
assertEntry(F, ignored, "out2x/out2.txt");
endWalk();
}
@Test
public void testWithSlashDoesNotMatchInSubDirectory() throws IOException {
writeIgnoreFile(".gitignore", "a/b");

11
org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java
View File

@ -596,7 +596,7 @@ public boolean isEntryIgnored() throws IOException {
* a relevant ignore rule file exists but cannot be read.
*/
protected boolean isEntryIgnored(final int pLen) throws IOException {
return isEntryIgnored(pLen, false);
return isEntryIgnored(pLen, mode, false);
}
/**
@ -605,13 +605,16 @@ protected boolean isEntryIgnored(final int pLen) throws IOException {
*
* @param pLen
* the length of the path in the path buffer.
* @param fileMode
* the original iterator file mode
* @param negatePrevious
* true if the previous matching iterator rule was negation
* @return true if the entry is ignored by an ignore rule.
* @throws IOException
* a relevant ignore rule file exists but cannot be read.
*/
private boolean isEntryIgnored(final int pLen, boolean negatePrevious)
private boolean isEntryIgnored(final int pLen, int fileMode,
boolean negatePrevious)
throws IOException {
IgnoreNode rules = getIgnoreNode();
if (rules != null) {
@ -623,7 +626,7 @@ private boolean isEntryIgnored(final int pLen, boolean negatePrevious)
if (0 < pOff)
pOff--;
String p = TreeWalk.pathOf(path, pOff, pLen);
switch (rules.isIgnored(p, FileMode.TREE.equals(mode),
switch (rules.isIgnored(p, FileMode.TREE.equals(fileMode),
negatePrevious)) {
case IGNORED:
return true;
@ -638,7 +641,7 @@ private boolean isEntryIgnored(final int pLen, boolean negatePrevious)
}
}
if (parent instanceof WorkingTreeIterator)
return ((WorkingTreeIterator) parent).isEntryIgnored(pLen,
return ((WorkingTreeIterator) parent).isEntryIgnored(pLen, fileMode,
negatePrevious);
return false;
}