From 8c014fdf4e7b7b2a88443d3f0f421536c9bd6960 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 22 Sep 2016 20:57:20 +0300
Subject: [PATCH] Don't propose origin remote name if there is one

---
 .../git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt  | 3 ++-
 .../git4idea/src/git4idea/remote/GitDefineRemoteDialog.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt b/plugins/git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt
index 3d46997f8e48..6becd559359d 100644
--- a/plugins/git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt
+++ b/plugins/git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt
@@ -98,7 +98,8 @@ class GitConfigureRemotesDialog(val project: Project, val repositories: Collecti
 
   private fun addRemote() {
     val repository = getSelectedRepo()
-    val dialog = GitDefineRemoteDialog(repository, git)
+    val proposedName = if (repository.remotes.any { it.name == GitRemote.ORIGIN_NAME }) "" else GitRemote.ORIGIN_NAME
+    val dialog = GitDefineRemoteDialog(repository, git, proposedName, "")
     if (dialog.showAndGet()) {
       runInModalTask("Adding Remote...", repository,
                      "Add Remote", "Couldn't add remote ${dialog.remoteName} '${dialog.remoteUrl}'") {
diff --git a/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java b/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java
index e316b0e925cd..cf0991e2be2f 100644
--- a/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java
+++ b/plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java
@@ -94,7 +94,7 @@ public class GitDefineRemoteDialog extends DialogWrapper {
   @Nullable
   @Override
   public JComponent getPreferredFocusedComponent() {
-    return myRemoteUrl;
+    return myRemoteName.getText().isEmpty() ? myRemoteName : myRemoteUrl;
   }
 
   @Override