aboutsummaryrefslogtreecommitdiff
path: root/t/t0027-auto-crlf.sh
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2016-04-25 18:56:32 +0200
committerJunio C Hamano <gitster@pobox.com>2016-04-25 12:12:03 -0700
commitcaa47adc5a68045bfb9e88fcfee0e50589d129df (patch)
tree1e88f5516a8c8e2e084755713945d88d093b04b8 /t/t0027-auto-crlf.sh
parent67e9bff06a82fd4c3f0caa577c1c8a3a0fc975ac (diff)
downloadgit-caa47adc5a68045bfb9e88fcfee0e50589d129df.tar.gz
git-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 't/t0027-auto-crlf.sh')
-rwxr-xr-xt/t0027-auto-crlf.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index fd5e326ec..93725895a 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