summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorLaurent Goubet2013-04-18 04:05:24 (EDT)
committer Gerrit Code Review @ Eclipse.org2013-04-18 08:20:55 (EDT)
commitcc34f6558e6c90b67c88444a9c3ff39b94190ec3 (patch)
treed31a1c074dab40ae5a83c7ca7531f12bd3051e25
parent7aac348c7ad4ff06c09d1892a4867f0f6059496f (diff)
downloadegit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.zip
egit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.tar.gz
egit-cc34f6558e6c90b67c88444a9c3ff39b94190ec3.tar.bz2
NPE when synchronizing with resources out of the workspacerefs/changes/05/12005/2
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitResourceVariantTreeSubscriber.java2
1 files changed, 1 insertions, 1 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 4f57e52..1fce3c6 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
@@ -241,7 +241,7 @@ public class GitResourceVariantTreeSubscriber extends
@Override
public IDiff getDiff(IResource resource) throws CoreException {
final GitSynchronizeData syncData = gsds.getData(resource.getProject());
- if (syncData.shouldIncludeLocal())
+ if (syncData == null || syncData.shouldIncludeLocal())
return super.getDiff(resource);
SyncInfo info = getSyncInfo(resource);