From 638b0e76290dd8121da2f462b783dc4ed296b32e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sun, 5 Aug 2012 15:17:29 +0400 Subject: [PATCH] Hide the pre-commit core.autocrlf check under the registry value until that functionality is tested. --- platform/platform-resources-en/src/misc/registry.properties | 2 ++ .../src/git4idea/checkin/GitCheckinHandlerFactory.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties index 8fc3a6e2adf9..7c9998f47f56 100644 --- a/platform/platform-resources-en/src/misc/registry.properties +++ b/platform/platform-resources-en/src/misc/registry.properties @@ -259,3 +259,5 @@ dark.laf.available=true actionSystem.force.alt.gr=false completion.show.intention.icon=true tabs.alphabetical=false +# temporary: until tested +git.warn.about.crlf=false diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java index feb48343b89e..e3620698bad0 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinHandlerFactory.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.CheckinProjectPanel; import com.intellij.openapi.vcs.ProjectLevelVcsManager; @@ -97,7 +98,7 @@ public class GitCheckinHandlerFactory extends VcsCheckinHandlerFactory { @NotNull private ReturnResult warnAboutCrlfIfNeeded() { GitVcsSettings settings = GitVcsSettings.getInstance(myProject); - if (!SystemInfo.isWindows || !settings.warnAboutCrlf()) { + if (!Registry.is("git.warn.about.crlf") || !SystemInfo.isWindows || !settings.warnAboutCrlf()) { return ReturnResult.COMMIT; }