1 files changed, 20 insertions, 7 deletions
diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
index 645fb24bcd1e..bd9c8fb3a1b3 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java
@@ -29,6 +29,8 @@ import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vcs.VcsNotifier;
 import com.intellij.ui.popup.list.ListPopupImpl;
+import com.intellij.util.containers.ContainerUtil;
+import git4idea.GitLocalBranch;
 import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.branch.GitBranchUtil;
@@ -184,7 +186,7 @@ class GitBranchPopup {
     GitRepositoryManager repositoryManager = myRepositoryManager;
     if (repositoryManager.moreThanOneRoot()) {
 
-      if (!myMultiRootBranchConfig.diverged() && userWantsSyncControl()) {
+      if (userWantsSyncControl()) {
         fillWithCommonRepositoryActions(popupGroup, repositoryManager);
       }
       else {
@@ -204,26 +206,37 @@ class GitBranchPopup {
   }
 
   private void fillWithCommonRepositoryActions(DefaultActionGroup popupGroup, GitRepositoryManager repositoryManager) {
-    List<GitRepository> repositories = repositoryManager.getRepositories();
-    String currentBranch = myMultiRootBranchConfig.getCurrentBranch();
-    assert currentBranch != null : "Current branch can't be null if branches have not diverged";
-    popupGroup.add(new GitBranchPopupActions.GitNewBranchAction(myProject, repositories));
+    List<GitRepository> allRepositories = repositoryManager.getRepositories();
+    popupGroup.add(new GitBranchPopupActions.GitNewBranchAction(myProject, allRepositories));
 
     popupGroup.addAll(createRepositoriesActions());
 
     popupGroup.addSeparator("Common Local Branches");
     for (String branch : myMultiRootBranchConfig.getLocalBranches()) {
-      if (!branch.equals(currentBranch)) {
+      List<GitRepository> repositories = filterRepositoriesNotOnThisBranch(branch, allRepositories);
+      if (!repositories.isEmpty()) {
         popupGroup.add(new GitBranchPopupActions.LocalBranchActions(myProject, repositories, branch, myCurrentRepository));
       }
     }
 
     popupGroup.addSeparator("Common Remote Branches");
     for (String branch : myMultiRootBranchConfig.getRemoteBranches()) {
-      popupGroup.add(new GitBranchPopupActions.RemoteBranchActions(myProject, repositories, branch, myCurrentRepository));
+      popupGroup.add(new GitBranchPopupActions.RemoteBranchActions(myProject, allRepositories, branch, myCurrentRepository));
     }
   }
 
+  @NotNull
+  private static List<GitRepository> filterRepositoriesNotOnThisBranch(@NotNull final String branch,
+                                                                       @NotNull List<GitRepository> allRepositories) {
+    return ContainerUtil.filter(allRepositories, new Condition<GitRepository>() {
+      @Override
+      public boolean value(GitRepository repository) {
+        GitLocalBranch currentBranch = repository.getCurrentBranch();
+        return currentBranch == null || !branch.equals(currentBranch.getName());
+      }
+    });
+  }
+
   private void warnThatBranchesDivergedIfNeeded() {
     if (myRepositoryManager.moreThanOneRoot() && myMultiRootBranchConfig.diverged() && userWantsSyncControl()) {
       myPopup.setWarning("Branches have diverged");