diff options
author | Anthony Sottile <asottile@umich.edu> | 2018-06-04 23:17:42 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-06-11 20:22:32 +0300 |
commit | 6cb09125bea69d9bdb461b8ecacd5c50c9e6a4f5 (patch) | |
tree | 1a229b1f279026e050df4804d977d969cd19c38e /config.c | |
parent | 8462ff43e42ab67cecd16fdfb59451a53cc8a945 (diff) |
config.c: fix regression for core.safecrlf false
A regression introduced in 8462ff43 ("convert_to_git():
safe_crlf/checksafe becomes int conv_flags", 2018-01-13) back in Git
2.17 cycle caused autocrlf rewrites to produce a warning message
despite setting safecrlf=false.
Signed-off-by: Anthony Sottile <asottile@umich.edu>
Acked-By: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r-- | config.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1156,7 +1156,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; } |