From f2bde69eb560aed59036bc22291a537380ba96c0 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 1 Jun 2012 17:26:41 +0400
Subject: [PATCH] IDEA-86695 Git cherry-pick correctly get the instance of
 GitCheckinEnvironment

AbstractVcs#getCheckinEnvironment returns a proxy instance.
We can query directly for the Service.
---
 .../src/git4idea/history/browser/GitCherryPicker.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index c391836019fb..1ea1dff3f174 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -18,6 +18,7 @@ package git4idea.history.browser;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
@@ -496,10 +497,9 @@ public class GitCherryPicker {
       public void execute(Collection<Change> changes, String commitMessage) {
         final Collection<Document> committingDocs = markCommittingDocs();
         try {
-          CheckinEnvironment ce = myPlatformFacade.getVcs(myProject).getCheckinEnvironment();
-          LOG.assertTrue(ce != null && ce instanceof GitCheckinEnvironment, "Invalid CheckinEnvironment: " + ce);
+          GitCheckinEnvironment ce = ServiceManager.getService(myProject, GitCheckinEnvironment.class);
           try {
-            ((GitCheckinEnvironment)ce).reset();
+            ce.reset();
             List<VcsException> exceptions = ce.commit(myChanges, myCommitMessage);
             VcsDirtyScopeManager.getInstance(myProject).filePathsDirty(ChangesUtil.getPaths(myChanges), null);
             if (exceptions != null && !exceptions.isEmpty()) {