NPE in GitRepositoryUpdater

diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
index 1d5b7c3b1f37483153ca6f4ba28bb79ba55a78a0..5ca586a35cb08fafdaf632e4800385ea391ee8e5 100644 (file)
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
@@ -92,7 +92,11 @@ public class GitRepositoryUpdater implements Disposable, BulkFileListener {
     boolean rebaseFileChanged = false;
     boolean mergeFileChanged = false;
     for (VFileEvent event : events) {
-      String filePath = stripFileProtocolPrefix(event.getFile().getPath());
+      final VirtualFile file = event.getFile();
+      if (file == null) {
+        continue;
+      }
+      String filePath = stripFileProtocolPrefix(file.getPath());
       if (isHeadFile(filePath)) {
         headChanged = true;
       } else if (isBranchFile(filePath)) {