2007-01-13 09:20:53 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Junio C Hamano
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='i18n settings and format-patch | am pipe'
|
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2007-01-13 09:20:53 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding () {
|
|
|
|
# Make sure characters are not corrupted
|
2015-03-25 05:30:17 +00:00
|
|
|
cnt="$1" header="$2" i=1 j=0
|
2007-01-13 21:34:44 +00:00
|
|
|
while test "$i" -le $cnt
|
|
|
|
do
|
|
|
|
git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j |
|
2007-06-01 21:08:12 +00:00
|
|
|
grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" &&
|
2007-07-03 05:52:14 +00:00
|
|
|
git cat-file commit HEAD~$j |
|
2007-01-13 21:34:44 +00:00
|
|
|
case "$header" in
|
|
|
|
8859)
|
2009-05-18 23:44:43 +00:00
|
|
|
grep "^encoding ISO8859-1" ;;
|
2007-01-13 21:34:44 +00:00
|
|
|
*)
|
2009-05-18 23:44:43 +00:00
|
|
|
grep "^encoding ISO8859-1"; test "$?" != 0 ;;
|
2015-03-25 05:30:17 +00:00
|
|
|
esac || return 1
|
2007-01-13 21:34:44 +00:00
|
|
|
j=$i
|
|
|
|
i=$(($i+1))
|
|
|
|
done
|
|
|
|
}
|
|
|
|
|
2007-01-13 09:20:53 +00:00
|
|
|
test_expect_success setup '
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
# use UTF-8 in author and committer name to match the
|
|
|
|
# i18n.commitencoding settings
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo "$GIT_AUTHOR_NAME" >mine &&
|
|
|
|
git add mine &&
|
|
|
|
git commit -s -m "Initial commit" &&
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
echo Hello world >mine &&
|
|
|
|
git add mine &&
|
|
|
|
git commit -s -m "Second on main" &&
|
|
|
|
|
|
|
|
# the first commit on the side branch is UTF-8
|
|
|
|
test_tick &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git checkout -b side main^ &&
|
2007-01-13 09:20:53 +00:00
|
|
|
echo Another file >yours &&
|
|
|
|
git add yours &&
|
|
|
|
git commit -s -m "Second on side" &&
|
|
|
|
|
2014-07-21 22:09:27 +00:00
|
|
|
if test_have_prereq !MINGW
|
2014-07-17 15:37:02 +00:00
|
|
|
then
|
|
|
|
# the second one on the side branch is ISO-8859-1
|
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
|
|
|
# use author and committer name in ISO-8859-1 to match it.
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt
|
2014-07-17 15:37:02 +00:00
|
|
|
fi &&
|
2007-01-13 09:20:53 +00:00
|
|
|
test_tick &&
|
|
|
|
echo Yet another >theirs &&
|
|
|
|
git add theirs &&
|
|
|
|
git commit -s -m "Third on side" &&
|
|
|
|
|
|
|
|
# Back to default
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch output (ISO-8859-1)' '
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git format-patch --stdout main..HEAD^ >out-l1 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
git format-patch --stdout HEAD^ >out-l2 &&
|
2009-05-18 23:44:43 +00:00
|
|
|
grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
|
|
|
|
grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
|
|
|
|
grep "^Content-Type: text/plain; charset=ISO8859-1" out-l2 &&
|
|
|
|
grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l2
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'format-patch output (UTF-8)' '
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git format-patch --stdout main..HEAD^ >out-u1 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
git format-patch --stdout HEAD^ >out-u2 &&
|
|
|
|
grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
|
2007-06-01 21:08:12 +00:00
|
|
|
grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
grep "^Content-Type: text/plain; charset=UTF-8" out-u2 &&
|
2007-06-01 21:08:12 +00:00
|
|
|
grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u2
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
test_expect_success 'rebase (U/U)' '
|
2007-01-13 09:20:53 +00:00
|
|
|
# We want the result of rebase in UTF-8
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
# The test is about logoutputencoding not affecting the
|
|
|
|
# final outcome -- it is used internally to generate the
|
|
|
|
# patch and the log.
|
|
|
|
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
# The result will be committed by GIT_COMMITTER_NAME --
|
|
|
|
# we want UTF-8 encoded name.
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 09:20:53 +00:00
|
|
|
git checkout -b test &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase main &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding 2
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
test_expect_success 'rebase (U/L)' '
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase main &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding 2
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
2014-07-21 22:09:27 +00:00
|
|
|
test_expect_success !MINGW 'rebase (L/L)' '
|
2007-01-13 09:20:53 +00:00
|
|
|
# In this test we want ISO-8859-1 encoded commits as the result
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase main &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding 2 8859
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
2014-07-21 22:09:27 +00:00
|
|
|
test_expect_success !MINGW 'rebase (L/U)' '
|
2007-01-13 09:20:53 +00:00
|
|
|
# This is pathological -- use UTF-8 as intermediate form
|
|
|
|
# to get ISO-8859-1 results.
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase main &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding 2 8859
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cherry-pick(U/U)' '
|
|
|
|
# Both the commitencoding and logoutputencoding is set to UTF-8.
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
git cherry-pick side^ &&
|
|
|
|
git cherry-pick side &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git revert HEAD &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 3
|
|
|
|
'
|
|
|
|
|
2014-07-21 22:09:27 +00:00
|
|
|
test_expect_success !MINGW 'cherry-pick(L/L)' '
|
2007-01-13 21:34:44 +00:00
|
|
|
# Both the commitencoding and logoutputencoding is set to ISO-8859-1
|
|
|
|
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
git cherry-pick side^ &&
|
|
|
|
git cherry-pick side &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git revert HEAD &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 3 8859
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cherry-pick(U/L)' '
|
|
|
|
# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
git cherry-pick side^ &&
|
|
|
|
git cherry-pick side &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git revert HEAD &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 3
|
|
|
|
'
|
|
|
|
|
2014-07-21 22:09:27 +00:00
|
|
|
test_expect_success !MINGW 'cherry-pick(L/U)' '
|
2007-01-13 21:34:44 +00:00
|
|
|
# Again, the commitencoding is set to ISO-8859-1 but
|
|
|
|
# logoutputencoding is set to UTF-8.
|
|
|
|
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
git cherry-pick side^ &&
|
|
|
|
git cherry-pick side &&
|
2007-11-02 15:33:07 +00:00
|
|
|
git revert HEAD &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 3 8859
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase --merge (U/U)' '
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase --merge main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase --merge (U/L)' '
|
2007-07-03 05:52:14 +00:00
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase --merge main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase --merge (L/L)' '
|
|
|
|
# In this test we want ISO-8859-1 encoded commits as the result
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
|
|
|
git config i18n.logoutputencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase --merge main &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
check_encoding 2 8859
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase --merge (L/U)' '
|
|
|
|
# This is pathological -- use UTF-8 as intermediate form
|
|
|
|
# to get ISO-8859-1 results.
|
2009-05-18 23:44:43 +00:00
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
2007-01-29 00:16:53 +00:00
|
|
|
git config i18n.logoutputencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2007-01-13 21:34:44 +00:00
|
|
|
|
|
|
|
git reset --hard side &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git rebase --merge main &&
|
2007-01-13 09:20:53 +00:00
|
|
|
|
2007-01-13 21:34:44 +00:00
|
|
|
check_encoding 2 8859
|
2007-01-13 09:20:53 +00:00
|
|
|
'
|
|
|
|
|
2015-07-19 15:49:18 +00:00
|
|
|
test_expect_success 'am (U/U)' '
|
|
|
|
# Apply UTF-8 patches with UTF-8 commitencoding
|
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2015-07-19 15:49:18 +00:00
|
|
|
git am out-u1 out-u2 &&
|
|
|
|
|
|
|
|
check_encoding 2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success !MINGW 'am (L/L)' '
|
|
|
|
# Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
|
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2015-07-19 15:49:18 +00:00
|
|
|
git am out-l1 out-l2 &&
|
|
|
|
|
|
|
|
check_encoding 2 8859
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'am (U/L)' '
|
|
|
|
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
|
|
|
# am specifies --utf8 by default.
|
|
|
|
git am out-l1 out-l2 &&
|
|
|
|
|
|
|
|
check_encoding 2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'am --no-utf8 (U/L)' '
|
|
|
|
# Apply ISO-8859-1 patches with UTF-8 commitencoding
|
|
|
|
git config i18n.commitencoding UTF-8 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2015-07-19 15:49:18 +00:00
|
|
|
git am --no-utf8 out-l1 out-l2 2>err &&
|
|
|
|
|
|
|
|
# commit-tree will warn that the commit message does not contain valid UTF-8
|
|
|
|
# as mailinfo did not convert it
|
2016-09-19 13:08:16 +00:00
|
|
|
test_i18ngrep "did not conform" err &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
|
|
|
check_encoding 2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success !MINGW 'am (L/U)' '
|
|
|
|
# Apply UTF-8 patches with ISO-8859-1 commitencoding
|
|
|
|
git config i18n.commitencoding ISO8859-1 &&
|
2017-05-09 12:54:24 +00:00
|
|
|
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
|
2015-07-19 15:49:18 +00:00
|
|
|
|
2020-11-18 23:44:26 +00:00
|
|
|
git reset --hard main &&
|
2015-07-19 15:49:18 +00:00
|
|
|
# mailinfo will re-code the commit message to the charset specified by
|
|
|
|
# i18n.commitencoding
|
|
|
|
git am out-u1 out-u2 &&
|
|
|
|
|
|
|
|
check_encoding 2 8859
|
|
|
|
'
|
|
|
|
|
2007-01-13 09:20:53 +00:00
|
|
|
test_done
|