summaryrefslogtreecommitdiff
path: root/contrib/subtree/README
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2016-04-25 18:56:32 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 12:12:03 -0700
commitcaa47adc5a68045bfb9e88fcfee0e50589d129df (patch)
tree1e88f5516a8c8e2e084755713945d88d093b04b8 /contrib/subtree/README
parentt0027: test cases for combined attributes (diff)
downloadtgif-caa47adc5a68045bfb9e88fcfee0e50589d129df.tar.xz
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>
Diffstat (limited to 'contrib/subtree/README')
0 files changed, 0 insertions, 0 deletions