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

Don't propose origin remote name if there is one

Browse Source
This commit is contained in:
Kirill Likhodedov
2016-09-26 19:09:33 +03:00
parent bcfdec5ee5
commit 8c014fdf4e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/remote/GitConfigureRemotesDialog.kt
+2 -1
View File
@@ -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}'") {
plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class GitDefineRemoteDialog extends DialogWrapper {
@Nullable
@Override
public JComponent getPreferredFocusedComponent() {
return myRemoteUrl;
return myRemoteName.getText().isEmpty() ? myRemoteName : myRemoteUrl;
}
@Override