MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-02-13 17:54:46 +04:00
parent 11a8d966e6
commit 2f4df6f3cb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+8 -7
View File
@@ -152,19 +152,20 @@ public class GitMultiRootBranchConfig {
@NotNull
private Collection<String> getCommonBranches(boolean local) {
Collection<String> commonLocal = null;
Collection<String> commonBranches = null;
for (GitRepository repository : myRepositories) {
GitBranchesCollection branchesCollection = repository.getBranches();
Collection<GitBranch> branches = local ? branchesCollection.getLocalBranches() : branchesCollection.getRemoteBranches();
if (commonLocal == null) {
commonLocal = GitUtil.getBranchNames(branches);
} else {
commonLocal.retainAll(GitUtil.getBranchNames(branches));
if (commonBranches == null) {
commonBranches = GitUtil.getBranchNames(branches);
}
else {
commonBranches.retainAll(GitUtil.getBranchNames(branches));
}
}
if (commonLocal != null) {
ArrayList<String> common = new ArrayList<String>(commonLocal);
if (commonBranches != null) {
ArrayList<String> common = new ArrayList<String>(commonBranches);
Collections.sort(common);
return common;
}