From 2d7101a02d003b3dd4884c71765df7673f9f7bf5 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 12 Sep 2017 22:34:29 +0300 Subject: [PATCH] Remove the obsolete registry value git.status.write No issues appeared with this setting, for a long time, so it is safe to remove the option. --- platform/util/resources/misc/registry.properties | 1 - plugins/git4idea/src/git4idea/commands/GitCommand.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 3bd68a4e6db6..fcfe61cdb7ac 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -926,7 +926,6 @@ database.src_storage.enabled=true database.generic_dialect.limit.description=Enables limit clause on generic dialect database.generic_dialect.limit=true -git.status.write=true git.blocking.read=true git.file.history.full=true git.file.history.full.description=Adds "--full-history --simplify-merges" to git log arguments when retrieving history for a file. \ diff --git a/plugins/git4idea/src/git4idea/commands/GitCommand.java b/plugins/git4idea/src/git4idea/commands/GitCommand.java index 768186b5eabf..3f6ae394c225 100644 --- a/plugins/git4idea/src/git4idea/commands/GitCommand.java +++ b/plugins/git4idea/src/git4idea/commands/GitCommand.java @@ -15,7 +15,6 @@ */ package git4idea.commands; -import com.intellij.openapi.util.registry.Registry; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -66,7 +65,7 @@ public class GitCommand { public static final GitCommand RM = write("rm"); public static final GitCommand SHOW = read("show"); public static final GitCommand STASH = write("stash"); - public static final GitCommand STATUS = Registry.is("git.status.write") ? write("status") : read("status"); + public static final GitCommand STATUS = write("status"); public static final GitCommand TAG = read("tag"); public static final GitCommand UPDATE_INDEX = write("update-index");