From cd165e3b73d7de332bcfcfbc171d03ced2ba9786 Mon Sep 17 00:00:00 2001 From: Michael Keppler Date: Fri, 31 Aug 2018 20:19:44 +0200 Subject: [PATCH] Sort upstream branch configuration case insensitive Bug: 538488 Change-Id: I098d42b31419ec10e0e5110bc0c4bf0b17af05d3 Signed-off-by: Michael Keppler --- .../ui/internal/dialogs/BranchConfigurationDialog.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java index 3ce329986..da56abf71 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/BranchConfigurationDialog.java @@ -17,10 +17,12 @@ package org.eclipse.egit.ui.internal.dialogs; import java.io.IOException; import java.net.URISyntaxException; -import java.util.Collection; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.eclipse.egit.ui.Activator; +import org.eclipse.egit.ui.internal.CommonUtils; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.components.BranchRebaseModeCombo; import org.eclipse.jface.dialogs.TitleAreaDialog; @@ -163,8 +165,9 @@ public class BranchConfigurationDialog extends TitleAreaDialog { } private void addBranchItemsForLocal() throws IOException { - Collection localRefs = myRepository.getRefDatabase() - .getRefsByPrefix(Constants.R_HEADS); + List localRefs = new ArrayList<>(myRepository.getRefDatabase() + .getRefsByPrefix(Constants.R_HEADS)); + Collections.sort(localRefs, CommonUtils.REF_ASCENDING_COMPARATOR); for (Ref ref : localRefs) branchText.add(ref.getName()); } @@ -177,8 +180,9 @@ public class BranchConfigurationDialog extends TitleAreaDialog { return; } - Collection allRefs = myRepository.getRefDatabase() - .getRefsByPrefix(Constants.R_REFS); + List allRefs = new ArrayList<>(myRepository.getRefDatabase() + .getRefsByPrefix(Constants.R_REFS)); + Collections.sort(allRefs, CommonUtils.REF_ASCENDING_COMPARATOR); for (Ref ref : allRefs) { for (RefSpec fetchSpec : fetchSpecs) { // Fetch specs map remote ref names (source) to local ref names -- 2.11.4.GIT