1 files changed, 26 insertions, 17 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java
index 081df79074..98dfbd3856 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/CreateBranchPage.java
@@ -91,7 +91,7 @@ class CreateBranchPage extends WizardPage {
 		if (sourceName.startsWith(Constants.R_TAGS))
 			return sourceName.substring(Constants.R_TAGS.length());
 
-		return null;
+		return ""; //$NON-NLS-1$
 	}
 
 	private final Repository myRepository;
@@ -196,6 +196,22 @@ class CreateBranchPage extends WizardPage {
 		GridDataFactory.fillDefaults().span(2, 1).grab(true, false).applyTo(
 				this.branchCombo);
 
+		Label nameLabel = new Label(main, SWT.NONE);
+		nameLabel.setText(UIText.CreateBranchPage_BranchNameLabel);
+
+		// we visualize the prefix here
+		Text prefix = new Text(main, SWT.NONE);
+		prefix.setText(Constants.R_HEADS);
+		prefix.setEnabled(false);
+
+		nameText = new Text(main, SWT.BORDER);
+		// give focus to the nameText if label is activated using the mnemonic
+		nameLabel.addTraverseListener(new TraverseListener() {
+			public void keyTraversed(TraverseEvent e) {
+				nameText.setFocus();
+			}
+		});
+
 		if (this.myBaseCommit != null) {
 			this.branchCombo.add(myBaseCommit.name());
 			this.branchCombo.setText(myBaseCommit.name());
@@ -209,10 +225,18 @@ class CreateBranchPage extends WizardPage {
 				}
 				map = myRepository.getRefDatabase()
 						.getRefs(Constants.R_REMOTES);
+				String firstRemote = null;
 				for (Entry<String, Ref> entry : map.entrySet()) {
 					if (entry.getValue().getLeaf().getObjectId()
-							.equals(myBaseCommit))
+							.equals(myBaseCommit)) {
 						this.branchCombo.add(entry.getValue().getName());
+						if (firstRemote == null)
+							firstRemote = entry.getValue().getName();
+					}
+				}
+				if (firstRemote != null) {
+					this.branchCombo.setText(firstRemote);
+					suggestBranchName(firstRemote);
 				}
 			} catch (IOException e) {
 				// bad luck, we can't extend the drop down; let's log an error
@@ -254,21 +278,6 @@ class CreateBranchPage extends WizardPage {
 			}
 		});
 
-		Label nameLabel = new Label(main, SWT.NONE);
-		nameLabel.setText(UIText.CreateBranchPage_BranchNameLabel);
-
-		// we visualize the prefix here
-		Text prefix = new Text(main, SWT.NONE);
-		prefix.setText(Constants.R_HEADS);
-		prefix.setEnabled(false);
-
-		nameText = new Text(main, SWT.BORDER);
-		// give focus to the nameText if label is activated using the mnemonic
-		nameLabel.addTraverseListener(new TraverseListener() {
-			public void keyTraversed(TraverseEvent e) {
-				nameText.setFocus();
-			}
-		});
 		nameText.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				nameIsSuggestion = false;