From cbcf8aa05b08802b0c8af5c6432d53789c3f928b Mon Sep 17 00:00:00 2001 From: Stefan Lay Date: Tue, 20 Apr 2010 11:15:23 +0200 Subject: [PATCH] Do not add untracked folders if they are ignored When a folder is ignored via the extension point "org.eclipse.team.core.ignore" this property is not inherited to contained resources. Therefore we have to check for folders if they are ignored and return false in the visitor's visit method. Bug: 309588 Change-Id: Iaf030af0a8c50c0ec775f127237c595d8e08cfe7 Signed-off-by: Stefan Lay Signed-off-by: Chris Aniszczyk --- .../src/org/eclipse/egit/ui/internal/actions/CommitAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java index 809a1ccf3..7ad409439 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/CommitAction.java @@ -416,7 +416,9 @@ public class CommitAction extends RepositoryAction { project.accept(new IResourceVisitor() { public boolean visit(IResource resource) throws CoreException { - if (resource.getType() == IResource.FILE && !Team.isIgnoredHint(resource)) { + if (Team.isIgnoredHint(resource)) + return false; + if (resource.getType() == IResource.FILE) { String repoRelativePath = RepositoryMapping.getMapping(project).getRepoRelativePath(resource); try { -- 2.11.4.GIT