diff options
-rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetContentProvider.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetContentProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetContentProvider.java index db1119a437..a800defeaf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetContentProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetContentProvider.java @@ -18,6 +18,7 @@ import org.eclipse.egit.core.Activator; import org.eclipse.egit.core.synchronize.GitSubscriberMergeContext; import org.eclipse.egit.core.synchronize.GitSubscriberResourceMappingContext; import org.eclipse.egit.ui.internal.synchronize.GitChangeSetModelProvider; +import org.eclipse.egit.ui.internal.synchronize.model.GitModelBlob; import org.eclipse.egit.ui.internal.synchronize.model.GitModelRoot; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.team.core.mapping.ISynchronizationContext; @@ -35,6 +36,14 @@ public class GitChangeSetContentProvider extends SynchronizationContentProvider private GitModelRoot modelRoot; @Override + public boolean hasChildren(Object element) { + if (element instanceof GitModelBlob) + return false; + + return super.hasChildren(element); + } + + @Override protected ITreeContentProvider getDelegateContentProvider() { if (provider == null) provider = new WorkbenchContentProvider(); |