merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
207
third_party/git/t/t3900-i18n-commit.sh
vendored
Executable file
207
third_party/git/t/t3900-i18n-commit.sh
vendored
Executable file
|
|
@ -0,0 +1,207 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Junio C Hamano
|
||||
#
|
||||
|
||||
test_description='commit and log output encodings'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
compare_with () {
|
||||
git show -s $1 | sed -e '1,/^$/d' -e 's/^ //' >current &&
|
||||
case "$3" in
|
||||
'')
|
||||
test_cmp "$2" current ;;
|
||||
?*)
|
||||
iconv -f "$3" -t UTF-8 >current.utf8 <current &&
|
||||
iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" &&
|
||||
test_cmp expect.utf8 current.utf8
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
test_expect_success setup '
|
||||
: >F &&
|
||||
git add F &&
|
||||
T=$(git write-tree) &&
|
||||
C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
|
||||
git update-ref HEAD $C &&
|
||||
git tag C0
|
||||
'
|
||||
|
||||
test_expect_success 'no encoding header for base case' '
|
||||
E=$(git cat-file commit C0 | sed -ne "s/^encoding //p") &&
|
||||
test z = "z$E"
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-16 refused because of NULs' '
|
||||
echo UTF-16 >F &&
|
||||
test_must_fail git commit -a -F "$TEST_DIRECTORY"/t3900/UTF-16.txt
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 invalid characters refused' '
|
||||
test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
|
||||
echo "UTF-8 characters" >F &&
|
||||
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
|
||||
>"$HOME/invalid" &&
|
||||
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
|
||||
test_i18ngrep "did not conform" "$HOME"/stderr
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 overlong sequences rejected' '
|
||||
test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
|
||||
rm -f "$HOME/stderr" "$HOME/invalid" &&
|
||||
echo "UTF-8 overlong" >F &&
|
||||
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
|
||||
>"$HOME/invalid" &&
|
||||
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
|
||||
test_i18ngrep "did not conform" "$HOME"/stderr
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 non-characters refused' '
|
||||
test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
|
||||
echo "UTF-8 non-character 1" >F &&
|
||||
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
|
||||
>"$HOME/invalid" &&
|
||||
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
|
||||
test_i18ngrep "did not conform" "$HOME"/stderr
|
||||
'
|
||||
|
||||
test_expect_success 'UTF-8 non-characters refused' '
|
||||
test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
|
||||
echo "UTF-8 non-character 2." >F &&
|
||||
printf "Commit message\n\nNon-character:\357\267\220\n" \
|
||||
>"$HOME/invalid" &&
|
||||
git commit -a -F "$HOME/invalid" 2>"$HOME"/stderr &&
|
||||
test_i18ngrep "did not conform" "$HOME"/stderr
|
||||
'
|
||||
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H setup" '
|
||||
git config i18n.commitencoding $H &&
|
||||
git checkout -b $H C0 &&
|
||||
echo $H >F &&
|
||||
git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
|
||||
'
|
||||
done
|
||||
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "check encoding header for $H" '
|
||||
E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") &&
|
||||
test "z$E" = "z'$H'"
|
||||
'
|
||||
done
|
||||
|
||||
test_expect_success 'config to remove customization' '
|
||||
git config --unset-all i18n.commitencoding &&
|
||||
if Z=$(git config --get-all i18n.commitencoding)
|
||||
then
|
||||
echo Oops, should have failed.
|
||||
false
|
||||
else
|
||||
test z = "z$Z"
|
||||
fi &&
|
||||
git config i18n.commitencoding UTF-8
|
||||
'
|
||||
|
||||
test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
||||
'
|
||||
|
||||
for H in eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in UTF-8 now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
||||
'
|
||||
done
|
||||
|
||||
test_expect_success 'config to add customization' '
|
||||
git config --unset-all i18n.commitencoding &&
|
||||
if Z=$(git config --get-all i18n.commitencoding)
|
||||
then
|
||||
echo Oops, should have failed.
|
||||
false
|
||||
else
|
||||
test z = "z$Z"
|
||||
fi
|
||||
'
|
||||
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in itself now" '
|
||||
git config i18n.commitencoding '$H' &&
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt
|
||||
'
|
||||
done
|
||||
|
||||
test_expect_success 'config to tweak customization' '
|
||||
git config i18n.logoutputencoding UTF-8
|
||||
'
|
||||
|
||||
test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
|
||||
compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
||||
'
|
||||
|
||||
for H in eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in UTF-8 now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
||||
'
|
||||
done
|
||||
|
||||
for J in eucJP ISO-2022-JP
|
||||
do
|
||||
if test "$J" = ISO-2022-JP
|
||||
then
|
||||
ICONV=$J
|
||||
else
|
||||
ICONV=
|
||||
fi
|
||||
git config i18n.logoutputencoding $J
|
||||
for H in eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "$H should be shown in $J now" '
|
||||
compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV
|
||||
'
|
||||
done
|
||||
done
|
||||
|
||||
for H in ISO8859-1 eucJP ISO-2022-JP
|
||||
do
|
||||
test_expect_success "No conversion with $H" '
|
||||
compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt
|
||||
'
|
||||
done
|
||||
|
||||
test_commit_autosquash_flags () {
|
||||
H=$1
|
||||
flag=$2
|
||||
test_expect_success "commit --$flag with $H encoding" '
|
||||
git config i18n.commitencoding $H &&
|
||||
git checkout -b $H-$flag C0 &&
|
||||
echo $H >>F &&
|
||||
git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
|
||||
test_tick &&
|
||||
echo intermediate stuff >>G &&
|
||||
git add G &&
|
||||
git commit -a -m "intermediate commit" &&
|
||||
test_tick &&
|
||||
echo $H $flag >>F &&
|
||||
git commit -a --$flag HEAD~1 &&
|
||||
E=$(git cat-file commit '$H-$flag' |
|
||||
sed -ne "s/^encoding //p") &&
|
||||
test "z$E" = "z$H" &&
|
||||
git config --unset-all i18n.commitencoding &&
|
||||
git rebase --autosquash -i HEAD^^^ &&
|
||||
git log --oneline >actual &&
|
||||
test_line_count = 3 actual
|
||||
'
|
||||
}
|
||||
|
||||
test_commit_autosquash_flags eucJP fixup
|
||||
|
||||
test_commit_autosquash_flags ISO-2022-JP squash
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue