Hide the pre-commit core.autocrlf check under the registry value until that functionality is tested.

This commit is contained in:
Kirill Likhodedov
2012-08-08 14:10:20 +04:00
parent eec045aa61
commit 638b0e7629
2 changed files with 4 additions and 1 deletions
@@ -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
@@ -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;
}