development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

t0025: rename the test files

Browse source 
The current test files are named one, two and three.
Make it clearer what the tests do and rename them into
LFonly, CRLFonly and LFwithNUL.

After the renaming we can see easier that we may want more test cases
for 2 types of files:
- files which have mixed LF and CRLF line endings,
- files which have mixed LF and CR line endings.

See commit fd6cce9e, "Add per-repository eol normalization" and
"the new safer autocrlf handling" in convert.c

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Torsten Bögershausen 2014-06-29 08:34:22 +02:00 committed by Junio C Hamano
parent 7fe6834801
commit b0cdb4dafc
1 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
t/t0025-crlf-auto.sh
View file

@ -12,144 +12,144 @@ test_expect_success setup '
git config core.autocrlf false && git config core.autocrlf false &&
for w in Hello world how are you; do echo $w; done >one && for w in Hello world how are you; do echo $w; done >LFonly &&
for w in I am very very fine thank you; do echo ${w}Q; done | q_to_cr >two && for w in I am very very fine thank you; do echo ${w}Q; done | q_to_cr >CRLFonly &&
for w in Oh here is a QNUL byte how alarming; do echo ${w}; done | q_to_nul >three && for w in Oh here is a QNUL byte how alarming; do echo ${w}; done | q_to_nul >LFwithNUL &&
git add . && git add . &&
git commit -m initial && git commit -m initial &&
one=$(git rev-parse HEAD:one) && LFonly=$(git rev-parse HEAD:LFonly) &&
two=$(git rev-parse HEAD:two) && CRLFonly=$(git rev-parse HEAD:CRLFonly) &&
three=$(git rev-parse HEAD:three) && LFwithNUL=$(git rev-parse HEAD:LFwithNUL) &&
echo happy. echo happy.
' '
test_expect_success 'default settings cause no changes' ' test_expect_success 'default settings cause no changes' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
! has_cr one && ! has_cr LFonly &&
has_cr two && has_cr CRLFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
twodiff=$(git diff two) && CRLFonlydiff=$(git diff CRLFonly) &&
threediff=$(git diff three) && LFwithNULdiff=$(git diff LFwithNUL) &&
test -z "$onediff" && test -z "$twodiff" && test -z "$threediff" test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
' '
test_expect_success 'crlf=true causes a CRLF file to be normalized' ' test_expect_success 'crlf=true causes a CRLF file to be normalized' '
# Backwards compatibility check # Backwards compatibility check
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
echo "two crlf" > .gitattributes && echo "CRLFonly crlf" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
# Note, "normalized" means that git will normalize it if added # Note, "normalized" means that git will normalize it if added
has_cr two && has_cr CRLFonly &&
twodiff=$(git diff two) && CRLFonlydiff=$(git diff CRLFonly) &&
test -n "$twodiff" test -n "$CRLFonlydiff"
' '
test_expect_success 'text=true causes a CRLF file to be normalized' ' test_expect_success 'text=true causes a CRLF file to be normalized' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
echo "two text" > .gitattributes && echo "CRLFonly text" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
# Note, "normalized" means that git will normalize it if added # Note, "normalized" means that git will normalize it if added
has_cr two && has_cr CRLFonly &&
twodiff=$(git diff two) && CRLFonlydiff=$(git diff CRLFonly) &&
test -n "$twodiff" test -n "$CRLFonlydiff"
' '
test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=false' ' test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=false' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf false && git config core.autocrlf false &&
echo "one eol=crlf" > .gitattributes && echo "LFonly eol=crlf" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr LFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
test -z "$onediff" test -z "$LFonlydiff"
' '
test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=input' ' test_expect_success 'eol=crlf gives a normalized file CRLFs with autocrlf=input' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf input && git config core.autocrlf input &&
echo "one eol=crlf" > .gitattributes && echo "LFonly eol=crlf" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr LFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
test -z "$onediff" test -z "$LFonlydiff"
' '
test_expect_success 'eol=lf gives a normalized file LFs with autocrlf=true' ' test_expect_success 'eol=lf gives a normalized file LFs with autocrlf=true' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf true && git config core.autocrlf true &&
echo "one eol=lf" > .gitattributes && echo "LFonly eol=lf" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
! has_cr one && ! has_cr LFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
test -z "$onediff" test -z "$LFonlydiff"
' '
test_expect_success 'autocrlf=true does not normalize CRLF files' ' test_expect_success 'autocrlf=true does not normalize CRLF files' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf true && git config core.autocrlf true &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr LFonly &&
has_cr two && has_cr CRLFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
twodiff=$(git diff two) && CRLFonlydiff=$(git diff CRLFonly) &&
threediff=$(git diff three) && LFwithNULdiff=$(git diff LFwithNUL) &&
test -z "$onediff" && test -z "$twodiff" && test -z "$threediff" test -z "$LFonlydiff" -a -z "$CRLFonlydiff" -a -z "$LFwithNULdiff"
' '
test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' ' test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf true && git config core.autocrlf true &&
echo "* text=auto" > .gitattributes && echo "* text=auto" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr one && has_cr LFonly &&
has_cr two && has_cr CRLFonly &&
onediff=$(git diff one) && LFonlydiff=$(git diff LFonly) &&
twodiff=$(git diff two) && CRLFonlydiff=$(git diff CRLFonly) &&
threediff=$(git diff three) && LFwithNULdiff=$(git diff LFwithNUL) &&
test -z "$onediff" && test -n "$twodiff" && test -z "$threediff" test -z "$LFonlydiff" -a -n "$CRLFonlydiff" -a -z "$LFwithNULdiff"
' '
test_expect_success 'text=auto, autocrlf=true does not normalize binary files' ' test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
git config core.autocrlf true && git config core.autocrlf true &&
echo "* text=auto" > .gitattributes && echo "* text=auto" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
! has_cr three && ! has_cr LFwithNUL &&
threediff=$(git diff three) && LFwithNULdiff=$(git diff LFwithNUL) &&
test -z "$threediff" test -z "$LFwithNULdiff"
' '
test_expect_success 'eol=crlf _does_ normalize binary files' ' test_expect_success 'eol=crlf _does_ normalize binary files' '
rm -f .gitattributes tmp one two three && rm -f .gitattributes tmp LFonly CRLFonly LFwithNUL &&
echo "three eol=crlf" > .gitattributes && echo "LFwithNUL eol=crlf" > .gitattributes &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
has_cr three && has_cr LFwithNUL &&
threediff=$(git diff three) && LFwithNULdiff=$(git diff LFwithNUL) &&
test -z "$threediff" test -z "$LFwithNULdiff"
' '
test_done test_done