From 11a8d966e6d0319724efd8bb8a283259cf6e9cb9 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 13 Feb 2012 17:15:05 +0400
Subject: [PATCH] Sort common local and remote branches in the popup

---
 .../git4idea/ui/branch/GitMultiRootBranchConfig.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
index 9aedb95d9477..4d5c1ee94cc1 100644
--- a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
@@ -162,7 +162,15 @@ public class GitMultiRootBranchConfig {
         commonLocal.retainAll(GitUtil.getBranchNames(branches));
       }
     }
-    return commonLocal != null ? commonLocal : Collections.<String>emptyList();
+
+    if (commonLocal != null) {
+      ArrayList<String> common = new ArrayList<String>(commonLocal);
+      Collections.sort(common);
+      return common;
+    }
+    else {
+      return Collections.emptyList();
+    }
   }
 
   @Override