Skip to content

Update: fixed typos in commit message #347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Update: fixed typos in commit message #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
438ac96
t0028: fix test for UTF-16-LE-BOM
SyntevoAlex Sep 18, 2019
e441027
t0028: add more tests
SyntevoAlex Sep 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 40 additions & 1 deletion t/t0028-working-tree-encoding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test_expect_success 'setup test files' '
printf "$text" | write_utf16 >test.utf16.raw &&
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Alexandr Miloslavskiy via GitGitGadget" <[email protected]>
writes:

> From: Alexandr Miloslavskiy <[email protected]>
>
> After I discovered that UTF-16-LE-BOM test was bugged, I decided that

s/bugged/buggy/ perhaps?  Usually people do not place hidden
listening devices in tests ;-)

> better tests are required. Possibly the best option here is to compare
> git results against hardcoded ground truth.
> ...
> +test_commit_utf8_checkout_other "UTF-8"        "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\124\145\163\164\040\320\242\320\265\321\201\321\202"
> +test_commit_utf8_checkout_other "UTF-16LE"     "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004=
\102\004"
> +test_commit_utf8_checkout_other "UTF-16BE"     "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101=
\004\102"
> +test_commit_utf8_checkout_other "UTF-16LE-BOM" "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\377\376\124\000\145\000\163\000\164\000\040\000\042\004\065\004=
\101\004\102\004"
> +test_commit_utf8_checkout_other "UTF-16BE-BOM" "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\376\377\000\124\000\145\000\163\000\164\000\040\004\042\004\065=
\004\101\004\102"
> +test_commit_utf8_checkout_other "UTF-32LE"     "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000=
\040\000\000\000\042\004\000\000\065\004\000\000\101\004\000\000\102\004\=
000\000"
> +test_commit_utf8_checkout_other "UTF-32BE"     "Test =D0=A2=D0=B5=D1=81=
=D1=82" "\000\000\000\124\000\000\000\145\000\000\000\163\000\000\000\164=
\000\000\000\040\000\000\004\042\000\000\004\065\000\000\004\101\000\000\=
004\102"

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the Git mailing list, Alexandr Miloslavskiy wrote (reply to this):

On 28.09.2019 6:47, Junio C Hamano wrote:
> s/bugged/buggy/ perhaps?  Usually people do not place hidden
> listening devices in tests ;-)

Yes, hinting those hidden listening devices was an oversight. Thanks for 
your help in putting them back undercover!

I understand that you already changed the commit message, so I'm not 
submitting updated patch.

printf "$text" | write_utf32 >test.utf32.raw &&
printf "\377\376" >test.utf16lebom.raw &&
printf "$text" | iconv -f UTF-8 -t UTF-32LE >>test.utf16lebom.raw &&
printf "$text" | iconv -f UTF-8 -t UTF-16LE >>test.utf16lebom.raw &&

# Line ending tests
printf "one\ntwo\nthree\n" >lf.utf8.raw &&
Expand Down Expand Up @@ -280,4 +280,43 @@ test_expect_success ICONV_SHIFT_JIS 'check roundtrip encoding' '
git reset
'

# $1: checkout encoding
# $2: test string
# $3: binary test string in checkout encoding
test_commit_utf8_checkout_other () {
encoding="$1"
orig_string="$2"
expect_bytes="$3"

test_expect_success "Commit UTF-8, checkout $encoding" '
test_when_finished "git checkout HEAD -- .gitattributes" &&

test_ext="commit_utf8_checkout_$encoding" &&
test_file="test.$test_ext" &&

# Commit as UTF-8
echo "*.$test_ext text working-tree-encoding=UTF-8" >.gitattributes &&
printf "$orig_string" >$test_file &&
git add $test_file &&
git commit -m "Test data" &&

# Checkout in tested encoding
rm $test_file &&
echo "*.$test_ext text working-tree-encoding=$encoding" >.gitattributes &&
git checkout HEAD -- $test_file &&

# Test
printf $expect_bytes >$test_file.raw &&
test_cmp_bin $test_file.raw $test_file
'
}

test_commit_utf8_checkout_other "UTF-8" "Test Тест" "\124\145\163\164\040\320\242\320\265\321\201\321\202"
test_commit_utf8_checkout_other "UTF-16LE" "Test Тест" "\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
test_commit_utf8_checkout_other "UTF-16BE" "Test Тест" "\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
test_commit_utf8_checkout_other "UTF-16LE-BOM" "Test Тест" "\377\376\124\000\145\000\163\000\164\000\040\000\042\004\065\004\101\004\102\004"
test_commit_utf8_checkout_other "UTF-16BE-BOM" "Test Тест" "\376\377\000\124\000\145\000\163\000\164\000\040\004\042\004\065\004\101\004\102"
test_commit_utf8_checkout_other "UTF-32LE" "Test Тест" "\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\000\042\004\000\000\065\004\000\000\101\004\000\000\102\004\000\000"
test_commit_utf8_checkout_other "UTF-32BE" "Test Тест" "\000\000\000\124\000\000\000\145\000\000\000\163\000\000\000\164\000\000\000\040\000\000\004\042\000\000\004\065\000\000\004\101\000\000\004\102"

test_done