aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-23 14:54:30 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-23 14:54:30 -0700
commit8e342255224f459ddff4d7f974161ae47d26d1d7 (patch)
treefc6f86ac1e51e7f5db5e101827363e062d092c57 /config.c
parent352d72a30e3d113064ebc194f49560eeae34b332 (diff)
parentcaa47adc5a68045bfb9e88fcfee0e50589d129df (diff)
downloadgit-8e342255224f459ddff4d7f974161ae47d26d1d7.tar.gz
git-8e342255224f459ddff4d7f974161ae47d26d1d7.tar.xz
Merge branch 'tb/core-eol-fix'
A couple of bugs around core.autocrlf have been fixed. * tb/core-eol-fix: convert.c: ident + core.autocrlf didn't work t0027: test cases for combined attributes convert: allow core.autocrlf=input and core.eol=crlf t0027: make commit_chk_wrnNNO() reliable
Diffstat (limited to 'config.c')
-rw-r--r--config.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/config.c b/config.c
index 096fe0316..f51c56bf9 100644
--- a/config.c
+++ b/config.c
@@ -806,8 +806,6 @@ static int git_default_core_config(const char *var, const char *value)
if (!strcmp(var, "core.autocrlf")) {
if (value && !strcasecmp(value, "input")) {
- if (core_eol == EOL_CRLF)
- return error("core.autocrlf=input conflicts with core.eol=crlf");
auto_crlf = AUTO_CRLF_INPUT;
return 0;
}
@@ -833,8 +831,6 @@ static int git_default_core_config(const char *var, const char *value)
core_eol = EOL_NATIVE;
else
core_eol = EOL_UNSET;
- if (core_eol == EOL_CRLF && auto_crlf == AUTO_CRLF_INPUT)
- return error("core.autocrlf=input conflicts with core.eol=crlf");
return 0;
}