diff options
author | Torsten Bögershausen <tboegi@web.de> | 2016-04-25 18:56:32 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-25 12:12:03 -0700 |
commit | caa47adc5a68045bfb9e88fcfee0e50589d129df (patch) | |
tree | 1e88f5516a8c8e2e084755713945d88d093b04b8 | |
parent | 67e9bff06a82fd4c3f0caa577c1c8a3a0fc975ac (diff) | |
download | git-caa47adc5a68045bfb9e88fcfee0e50589d129df.tar.gz |
convert.c: ident + core.autocrlf didn't worktb/core-eol-fix
When the ident attributes is set, get_stream_filter() did not obey
core.autocrlf=true, and the file was checked out with LF.
Change the rule when a streaming filter can be used:
- if an external filter is specified, don't use a stream filter.
- if the worktree eol is CRLF and "auto" is active, don't use a stream filter.
- Otherwise the stream filter can be used.
Add test cases in t0027.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | convert.c | 19 | ||||
-rwxr-xr-x | t/t0027-auto-crlf.sh | 2 |
2 files changed, 8 insertions, 13 deletions
@@ -1380,27 +1380,22 @@ static struct stream_filter *ident_filter(const unsigned char *sha1) struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1) { struct conv_attrs ca; - enum crlf_action crlf_action; struct stream_filter *filter = NULL; convert_attrs(&ca, path); - if (ca.drv && (ca.drv->smudge || ca.drv->clean)) - return filter; + return NULL; + + if (ca.crlf_action == CRLF_AUTO || ca.crlf_action == CRLF_AUTO_CRLF) + return NULL; if (ca.ident) filter = ident_filter(sha1); - crlf_action = ca.crlf_action; - - if ((crlf_action == CRLF_BINARY) || - crlf_action == CRLF_AUTO_INPUT || - (crlf_action == CRLF_TEXT_INPUT)) - filter = cascade_filter(filter, &null_filter_singleton); - - else if (output_eol(crlf_action) == EOL_CRLF && - !(crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_CRLF)) + if (output_eol(ca.crlf_action) == EOL_CRLF) filter = cascade_filter(filter, lf_to_crlf_filter()); + else + filter = cascade_filter(filter, &null_filter_singleton); return filter; } diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index fd5e326ec7..93725895a4 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -493,7 +493,7 @@ fi export CRLF_MIX_LF_CR MIX NL # Same handling with and without ident -for id in "" +for id in "" ident do for ceol in lf crlf native do |