diff options
| author | Robin Stocker | 2012-12-13 10:20:53 +0000 |
|---|---|---|
| committer | Robin Stocker | 2012-12-13 10:20:53 +0000 |
| commit | 0c7958c4263743ff929abc07ddfe57919f329775 (patch) | |
| tree | 71ddd2aeaa49b7a7d8c103fe9182f20257620d4b | |
| parent | c07aba22f7f958e40a710c1d36ab0a8918e3532d (diff) | |
| download | egit-0c7958c4263743ff929abc07ddfe57919f329775.tar.gz egit-0c7958c4263743ff929abc07ddfe57919f329775.tar.xz egit-0c7958c4263743ff929abc07ddfe57919f329775.zip | |
Fix NPE in GitModelSynchronizeParticipant#asCompareInput
Bug: 396416
Change-Id: I52c42aa7d783d4329b5e35bac388f999866e7074
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java index 3cf2e9ec82..7d6a1e1f58 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitModelSynchronizeParticipant.java @@ -217,7 +217,7 @@ public class GitModelSynchronizeParticipant extends ModelSynchronizeParticipant if (object instanceof IFile) { IFile file = (IFile) object; GitSynchronizeData gsd = gsds.getData(file.getProject()); - if (!gsd.shouldIncludeLocal()) + if (gsd != null && !gsd.shouldIncludeLocal()) return getFileFromGit(gsd, file.getLocation()); } |