diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-06 21:27:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-06 21:27:36 (GMT) |
| commit | 7dcbf891d975eba5b1e3095cb3b389834689ac09 (patch) | |
| tree | a7366f7f120101529b906c01a97834a33c5608e2 /config.c | |
| parent | 05781d37fa43b5dada77d1bcfd4cdc42742e7421 (diff) | |
| parent | caa47adc5a68045bfb9e88fcfee0e50589d129df (diff) | |
| download | git-7dcbf891d975eba5b1e3095cb3b389834689ac09.zip git-7dcbf891d975eba5b1e3095cb3b389834689ac09.tar.gz git-7dcbf891d975eba5b1e3095cb3b389834689ac09.tar.bz2 | |
Merge branch 'tb/core-eol-fix' into maint
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.c | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -803,8 +803,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; } @@ -830,8 +828,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; } |