summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorLibravatar Anthony Sottile <asottile@umich.edu>2018-06-04 13:17:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-11 10:22:32 -0700
commit6cb09125bea69d9bdb461b8ecacd5c50c9e6a4f5 (patch)
tree1a229b1f279026e050df4804d977d969cd19c38e /config.c
parentconvert_to_git(): safe_crlf/checksafe becomes int conv_flags (diff)
downloadtgif-6cb09125bea69d9bdb461b8ecacd5c50c9e6a4f5.tar.xz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index 1f003fbb90..a2d91b5ebd 100644
--- a/config.c
+++ b/config.c
@@ -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;
}