From b6b074e3a25d24323b2baafc0a20dddadb3041b9 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 7 Feb 2012 20:22:37 +0400
Subject: [PATCH] Inline

---
 .../src/git4idea/branch/GitCheckoutOperation.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
index ca1974c9c31f..64077d856333 100644
--- a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
@@ -111,7 +111,10 @@ class GitCheckoutOperation extends GitBranchOperation {
     // get changes overwritten by checkout from the error message captured from Git
     List<Change> affectedChanges = GitUtil.convertPathsToChanges(repository, localChangesOverwrittenByCheckout.getRelativeFilePaths(), true);
     // get all other conflicting changes
-    Map<GitRepository, List<Change>> conflictingChangesInRepositories = collectLocalChangesOnAllOtherRepositories(repository);
+    // get changes in all other repositories (except those which already have succeeded) to avoid multiple dialogs proposing smart checkout
+    Map<GitRepository, List<Change>> conflictingChangesInRepositories =
+      collectLocalChangesConflictingWithBranch(myProject, getRemainingRepositoriesExceptGiven(repository), myPreviousBranch, myStartPointReference);
+
     Set<GitRepository> otherProblematicRepositories = conflictingChangesInRepositories.keySet();
     List<GitRepository> allConflictingRepositories = new ArrayList<GitRepository>(otherProblematicRepositories);
     allConflictingRepositories.add(repository);
@@ -156,13 +159,6 @@ class GitCheckoutOperation extends GitBranchOperation {
     }
   }
 
-  @NotNull
-  private Map<GitRepository, List<Change>> collectLocalChangesOnAllOtherRepositories(@NotNull final GitRepository currentRepository) {
-    // get changes in all other repositories (except those which already have succeeded) to avoid multiple dialogs proposing smart checkout
-    List<GitRepository> remainingRepositories = getRemainingRepositoriesExceptGiven(currentRepository);
-    return collectLocalChangesConflictingWithBranch(myProject, remainingRepositories, myPreviousBranch, myStartPointReference);
-  }
-
   @NotNull
   @Override
   protected String getRollbackProposal() {