mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
23ce5c39dc
The call to test_expect_success is nested inside a function, whose arguments the test code wants to access. But it is not specified that any unexpanded $1, $2, $3, etc in the test code will access the surrounding function's arguments. Rather, they will access the arguments of the function that happens to eval the test code. In this case, the reference is intended to supply '-m message' to a call of 'git commit --squash'. Remove it because -m is optional and the test case does not check for it. There are tests in t7500 that check combinations of --squash and -m. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
165 lines
3.6 KiB
Bash
Executable file
165 lines
3.6 KiB
Bash
Executable file
#!/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"
|
|
'
|
|
|
|
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 3 = $(wc -l <actual)
|
|
'
|
|
}
|
|
|
|
test_commit_autosquash_flags eucJP fixup
|
|
|
|
test_commit_autosquash_flags ISO-2022-JP squash
|
|
|
|
test_done
|