| commit | caa47adc5a68045bfb9e88fcfee0e50589d129df | |
| author | Torsten Bögershausen <tboegi@web.de> | |
| Mon, 25 Apr 2016 16:56:32 +0000 (25 18:56 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Apr 2016 19:12:03 +0000 (25 12:12 -0700) | ||
| tree | 1e88f5516a8c8e2e084755713945d88d093b04b8 | treesnapshot (tar.gz zip) |
| parent | 67e9bff06a82fd4c3f0caa577c1c8a3a0fc975ac | commitdiff |
convert.c: ident + core.autocrlf didn't work
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>
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>
| convert.c | diffblobblamehistory | |
| t/t0027-auto-crlf.sh | diffblobblamehistory |