diff --git a/plugins/git4idea/src/git4idea/commands/GitHandler.java b/plugins/git4idea/src/git4idea/commands/GitHandler.java index 3357e4dc4da8..c3ea76760614 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitHandler.java @@ -152,7 +152,7 @@ public abstract class GitHandler { protected GitHandler(@NotNull Project project, @NotNull File directory, @NotNull GitCommand command) { myProject = project; myCommand = command; - mySettings = GitVcsSettings.getInstanceChecked(project); + mySettings = GitVcsSettings.getInstance(project); myEnv = new HashMap(System.getenv()); if (!myEnv.containsKey("HOME")) { String home = System.getProperty("user.home"); diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index fca030c625ec..b60af7302e44 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -15,14 +15,11 @@ */ package git4idea.config; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; -import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Computable; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -281,21 +278,6 @@ public class GitVcsSettings implements PersistentStateComponent() { - public GitVcsSettings compute() { - if (project.isDisposed()) throw new ProcessCanceledException(); - return ServiceManager.getService(project, GitVcsSettings.class); - } - }); - } - /** * @return true if IDEA ssh should be used */