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.emptyList(); + + if (commonLocal != null) { + ArrayList common = new ArrayList(commonLocal); + Collections.sort(common); + return common; + } + else { + return Collections.emptyList(); + } } @Override