From 69874e5c096f32648e76a53624286abafeb80bcd Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Thu, 6 Nov 2014 00:56:39 +0100
Subject: [PATCH] Fix RepositorySearchDialog when browsing different
 directories

When clicking "Browse" multiple times for different directories
containing repositories the RepositorySearchDialog only displayed the
repositories selected in the last browse step but also added
repositories selected in earlier browse steps. This is surprising as the
latter weren't displayed before finishing the wizard.

Bug: 450213
Change-Id: I6081f933000b6f92c73ac7817d625b0472ca1f2f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 .../eclipse/egit/ui/internal/repository/RepositorySearchDialog.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
index 2f80f5e37..4bb37b5ef 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
@@ -198,7 +198,6 @@ public class RepositorySearchDialog extends WizardPage {
 	@Override
 	public void dispose() {
 		fResult = getCheckedItems();
-		fResult.addAll(getCheckedItems());
 		super.dispose();
 	}
 
@@ -464,6 +463,8 @@ public class RepositorySearchDialog extends WizardPage {
 			// ignore
 		}
 
+		final TreeSet<String> validDirs = new TreeSet<String>(getCheckedItems());
+
 		IRunnableWithProgress action = new IRunnableWithProgress() {
 
 			public void run(IProgressMonitor monitor)
@@ -497,8 +498,6 @@ public class RepositorySearchDialog extends WizardPage {
 
 		int foundOld = 0;
 
-		final TreeSet<String> validDirs = new TreeSet<String>();
-
 		for (String foundDir : directories) {
 			if (!fExistingDirectories.contains(foundDir)) {
 				validDirs.add(foundDir);
-- 
2.11.4.GIT