summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorKevin Sawicki2011-04-19 23:13:56 (EDT)
committer Kevin Sawicki2011-04-19 23:13:56 (EDT)
commit3fa9329e38292a98178f99b704fa8d59acd8c0ea (patch)
tree91c0625b003cac5f9d5ecaa7756a807a7c50a486
parent3b977c21418118dbeb2575961e67ba459097ee09 (diff)
downloadegit-3fa9329e38292a98178f99b704fa8d59acd8c0ea.zip
egit-3fa9329e38292a98178f99b704fa8d59acd8c0ea.tar.gz
egit-3fa9329e38292a98178f99b704fa8d59acd8c0ea.tar.bz2
[sync] Only supervise resources of type FILE.refs/changes/81/3181/1
This corrects issues where folders are marked as incoming or outgoing when they really contain children of both kinds. Bug: 324604 Change-Id: Ib25bf43721ef4cc87dba33aa01909e50a4cbef48 Signed-off-by: Kevin Sawicki <kevin@github.com>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java
index c3ecdf8..3993220 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java
@@ -66,10 +66,10 @@ public class GitResourceVariantTreeSubscriber extends
@Override
public boolean isSupervised(IResource res) throws TeamException {
- return gsds.contains(res.getProject()) && !isIgnoredHint(res);
+ return IResource.FILE == res.getType()
+ && gsds.contains(res.getProject()) && !isIgnoredHint(res);
}
-
@Override
public IResource[] members(IResource res) throws TeamException {
if(res.getType() == IResource.FILE)