From 83fc84993cfb3ec654d06538fce32bb3bd70adc6 Mon Sep 17 00:00:00 2001 From: "Ilia.Shulgin" Date: Fri, 18 Oct 2024 16:44:35 +0200 Subject: [PATCH] [git] IJPL-84816 Delete git.clone.shallow registry key (cherry picked from commit 256392f36282aca50551dc92614b554c8f52f98b) IJ-CR-147381 GitOrigin-RevId: 6572d5656d8682e426d58c70b7f998085c3a9c30 --- plugins/git4idea/resources/intellij.vcs.git.xml | 2 -- plugins/git4idea/src/git4idea/ui/GitCloneDialogComponent.kt | 4 +--- .../ui/cloneDialog/GHCloneDialogExtensionComponentBase.kt | 4 +--- .../ui/clone/GitLabCloneRepositoriesComponentFactory.kt | 4 +--- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/plugins/git4idea/resources/intellij.vcs.git.xml b/plugins/git4idea/resources/intellij.vcs.git.xml index 370823e258e6..229a53aff108 100644 --- a/plugins/git4idea/resources/intellij.vcs.git.xml +++ b/plugins/git4idea/resources/intellij.vcs.git.xml @@ -626,8 +626,6 @@ description="Enable embedded pinentry application for unlock GPG private key while Git perform commit signing. For remote dev (unix backend) and WSL."/> - diff --git a/plugins/git4idea/src/git4idea/ui/GitCloneDialogComponent.kt b/plugins/git4idea/src/git4idea/ui/GitCloneDialogComponent.kt index 4d1550518cf3..2dd8e79314ef 100644 --- a/plugins/git4idea/src/git4idea/ui/GitCloneDialogComponent.kt +++ b/plugins/git4idea/src/git4idea/ui/GitCloneDialogComponent.kt @@ -161,9 +161,7 @@ private class GitCloneDialogMainPanelCustomizer : DvcsCloneDialogComponent.MainP private val vm = GitShallowCloneViewModel() override fun configure(panel: Panel) { - if (Registry.`is`("git.clone.shallow")) { - GitShallowCloneComponentFactory.appendShallowCloneRow(panel, vm).bottomGap(BottomGap.SMALL) - } + GitShallowCloneComponentFactory.appendShallowCloneRow(panel, vm).bottomGap(BottomGap.SMALL) } fun getShallowCloneOptions() = vm.getShallowCloneOptions() diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/cloneDialog/GHCloneDialogExtensionComponentBase.kt b/plugins/github/src/org/jetbrains/plugins/github/ui/cloneDialog/GHCloneDialogExtensionComponentBase.kt index 268d1bf64e47..b1b4204f139e 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/cloneDialog/GHCloneDialogExtensionComponentBase.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/cloneDialog/GHCloneDialogExtensionComponentBase.kt @@ -174,9 +174,7 @@ internal abstract class GHCloneDialogExtensionComponentBase( CloneDvcsValidationUtils.checkDirectory(it.text, it.textField) } } - if (Registry.`is`("git.clone.shallow")) { - GitShallowCloneComponentFactory.appendShallowCloneRow(this, shallowCloneModel) - } + GitShallowCloneComponentFactory.appendShallowCloneRow(this, shallowCloneModel) } repositoriesPanel.border = JBEmptyBorder(UIUtil.getRegularPanelInsets()) setupAccountsListeners() diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/clone/GitLabCloneRepositoriesComponentFactory.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/clone/GitLabCloneRepositoriesComponentFactory.kt index 015b3e00f074..c8bbf7bf7bef 100644 --- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/clone/GitLabCloneRepositoriesComponentFactory.kt +++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/clone/GitLabCloneRepositoriesComponentFactory.kt @@ -95,9 +95,7 @@ internal object GitLabCloneRepositoriesComponentFactory { CloneDvcsValidationUtils.checkDirectory(it.text, it.textField as JComponent) } } - if (Registry.`is`("git.clone.shallow")) { - GitShallowCloneComponentFactory.appendShallowCloneRow(this, repositoriesVm.shallowCloneVm) - } + GitShallowCloneComponentFactory.appendShallowCloneRow(this, repositoriesVm.shallowCloneVm) }.apply { border = JBEmptyBorder(UIUtil.getRegularPanelInsets()) }