Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-28 22:53:29 +0300
committerJunio C Hamano <gitster@pobox.com>2018-06-28 22:53:29 +0300
commit8063ff9cf595dc9414e7a27d3310ae1031f5c883 (patch)
tree5a802422eefc4bc4c92e580e953a9ebe785b6030 /config.c
parenta9097269036141876c586ddeee561a37b686c8e5 (diff)
parent6cb09125bea69d9bdb461b8ecacd5c50c9e6a4f5 (diff)
Merge branch 'as/safecrlf-quiet-fix'
Fix for 2.17-era regression around `core.safecrlf`. * as/safecrlf-quiet-fix: config.c: fix regression for core.safecrlf false
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index a0a6ae1980..f4a208a166 100644
--- a/config.c
+++ b/config.c
@@ -1233,7 +1233,7 @@ static int git_default_core_config(const char *var, const char *value)
}
eol_rndtrp_die = git_config_bool(var, value);
global_conv_flags_eol = eol_rndtrp_die ?
- CONV_EOL_RNDTRP_DIE : CONV_EOL_RNDTRP_WARN;
+ CONV_EOL_RNDTRP_DIE : 0;
return 0;
}