From b8d736cded9f8c8b0c7bd6430521d7bf6c034373 Mon Sep 17 00:00:00 2001
From: Nadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Date: Thu, 4 Dec 2014 17:05:39 +0300
Subject: [PATCH] tasks-test  git dependency reverted

---
 plugins/git4idea/git4idea.iml                                 | 1 -
 plugins/tasks/tasks-tests/tasks-tests.iml                     | 1 +
 .../test/com/intellij/tasks/vcs}/GitTaskBranchesTest.java     | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename plugins/{git4idea/tests/git4idea/branch => tasks/tasks-tests/test/com/intellij/tasks/vcs}/GitTaskBranchesTest.java (96%)

diff --git a/plugins/git4idea/git4idea.iml b/plugins/git4idea/git4idea.iml
index 60f7a1ac5b8c..5c523bdd9b93 100644
--- a/plugins/git4idea/git4idea.iml
+++ b/plugins/git4idea/git4idea.iml
@@ -59,6 +59,5 @@
     <orderEntry type="module" module-name="vcs-log-impl" />
     <orderEntry type="module" module-name="vcs-log-graph" />
     <orderEntry type="module" module-name="dvcs-api" exported="" />
-    <orderEntry type="module" module-name="tasks-tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/tasks/tasks-tests/tasks-tests.iml b/plugins/tasks/tasks-tests/tasks-tests.iml
index 4e9157f0112d..f57b9362e8a9 100644
--- a/plugins/tasks/tasks-tests/tasks-tests.iml
+++ b/plugins/tasks/tasks-tests/tasks-tests.iml
@@ -21,5 +21,6 @@
     <orderEntry type="module" module-name="jira" scope="TEST" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="dvcs-api" scope="TEST" />
+    <orderEntry type="module" module-name="git4idea" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/git4idea/tests/git4idea/branch/GitTaskBranchesTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
similarity index 96%
rename from plugins/git4idea/tests/git4idea/branch/GitTaskBranchesTest.java
rename to plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
index 171144f8beae..3a5f52f78fff 100644
--- a/plugins/git4idea/tests/git4idea/branch/GitTaskBranchesTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/GitTaskBranchesTest.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.branch;
+package com.intellij.tasks.vcs;
 
 import com.intellij.dvcs.repo.Repository;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.tasks.vcs.TaskBranchesTest;
+import git4idea.branch.GitBranchesCollection;
 import git4idea.config.GitVcsSettings;
 import git4idea.repo.GitRepository;
 import git4idea.test.GitExecutor;