Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2011-02-23 12:08:02 +0000
committerChris Aniszczyk2011-03-07 17:19:55 +0000
commit4dea00dcb599aef7fedb891cdae2f6c084ba08fb (patch)
treed5a80a3e36569d6709056d493612ae20b963bfa4 /org.eclipse.egit.core
parent28bda858c223b8fba3815f2586a5ac9346afc40f (diff)
downloadegit-4dea00dcb599aef7fedb891cdae2f6c084ba08fb.tar.gz
egit-4dea00dcb599aef7fedb891cdae2f6c084ba08fb.tar.xz
egit-4dea00dcb599aef7fedb891cdae2f6c084ba08fb.zip
Respect ignore rules in info/exclude and core.excludesfile
ContainerTreeIterator missed to initialize the root iterator loading the ignore rules defined in .git/info/exclude and the file defined by the configuration parameter core.excludesfile. Bug: 328101 Bug: 328428 Change-Id: I4c64ef13f5579bbbda637e64911b558070289d8f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.egit.core')
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
index 29952e51ff..9442851534 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
@@ -77,6 +77,7 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
super(computePrefix(base), repository.getConfig().get(WorkingTreeOptions.KEY));
node = base;
init(entries());
+ initRootIterator(repository);
}
/**
@@ -96,6 +97,7 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
super("", repository.getConfig().get(WorkingTreeOptions.KEY)); //$NON-NLS-1$
node = root;
init(entries());
+ initRootIterator(repository);
}
/**
@@ -118,6 +120,9 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
super(p);
node = base;
init(entries());
+ Repository repository = RepositoryMapping.getMapping(base)
+ .getRepository();
+ initRootIterator(repository);
}
@Override

Back to the top