summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:29 -0700
commit8063ff9cf595dc9414e7a27d3310ae1031f5c883 (patch)
tree5a802422eefc4bc4c92e580e953a9ebe785b6030 /config.c
parentMerge branch 'ab/refspec-init-fix' (diff)
parentconfig.c: fix regression for core.safecrlf false (diff)
downloadtgif-8063ff9cf595dc9414e7a27d3310ae1031f5c883.tar.xz
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;
}