Merge branch 'jc/int'

* jc/int:
  More tests in t3901.
  Consistent message encoding while reusing log from an existing commit.
  t3901: test "format-patch | am" pipe with i18n
  Use log output encoding in --pretty=email headers.

3 files changed, 263 insertions, 0 deletions

diff --git a/t/t3901-8859-1.txt b/t/t3901-8859-1.txt
new file mode 100755
index 0000000..38c21a6
--- /dev/null
+++ b/t/t3901-8859-1.txt
@@ -0,0 +1,4 @@
+: to be sourced in t3901 -- this is latin-1
+GIT_AUTHOR_NAME="Αιν σϊ" &&
+GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME &&
+export GIT_AUTHOR_NAME GIT_COMMITTER_NAME
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
new file mode 100755
index 0000000..eda0e2d
--- /dev/null
+++ b/t/t3901-i18n-patch.sh
@@ -0,0 +1,255 @@
+#!/bin/sh
+#
+# Copyright (c) 2006 Junio C Hamano
+#
+
+test_description='i18n settings and format-patch | am pipe'
+
+. ./test-lib.sh
+
+check_encoding () {
+	# Make sure characters are not corrupted
+	cnt="$1" header="$2" i=1 j=0 bad=0
+	while test "$i" -le $cnt
+	do
+		git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j |
+		grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" &&
+		git-cat-file commit HEAD~$j |
+		case "$header" in
+		8859)
+			grep "^encoding ISO-8859-1" ;;
+		*)
+			! grep "^encoding ISO-8859-1" ;;
+		esac || {
+			bad=1
+			break
+		}
+		j=$i
+		i=$(($i+1))
+	done
+	(exit $bad)
+}
+
+test_expect_success setup '
+	git-repo-config i18n.commitencoding UTF-8 &&
+
+	# use UTF-8 in author and committer name to match the
+	# i18n.commitencoding settings
+	. ../t3901-utf8.txt &&
+
+	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 &&
+	git checkout -b side master^ &&
+	echo Another file >yours &&
+	git add yours &&
+	git commit -s -m "Second on side" &&
+
+	# the second one on the side branch is ISO-8859-1
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	# use author and committer name in ISO-8859-1 to match it.
+	. ../t3901-8859-1.txt &&
+	test_tick &&
+	echo Yet another >theirs &&
+	git add theirs &&
+	git commit -s -m "Third on side" &&
+
+	# Back to default
+	git-repo-config i18n.commitencoding UTF-8
+'
+
+test_expect_success 'format-patch output (ISO-8859-1)' '
+	git-repo-config i18n.logoutputencoding ISO-8859-1 &&
+
+	git format-patch --stdout master..HEAD^ >out-l1 &&
+	git format-patch --stdout HEAD^ >out-l2 &&
+	grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l1 &&
+	grep "^From: =?ISO-8859-1?q?=C1=E9=ED_=F3=FA?=" out-l1 &&
+	grep "^Content-Type: text/plain; charset=ISO-8859-1" out-l2 &&
+	grep "^From: =?ISO-8859-1?q?=C1=E9=ED_=F3=FA?=" out-l2
+'
+
+test_expect_success 'format-patch output (UTF-8)' '
+	git repo-config i18n.logoutputencoding UTF-8 &&
+
+	git format-patch --stdout master..HEAD^ >out-u1 &&
+	git format-patch --stdout HEAD^ >out-u2 &&
+	grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
+	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" out-u1 &&
+	grep "^Content-Type: text/plain; charset=UTF-8" out-u2 &&
+	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD_=C3=B3=C3=BA?=" out-u2
+'
+
+test_expect_success 'rebase (U/U)' '
+	# We want the result of rebase in UTF-8
+	git-repo-config i18n.commitencoding UTF-8 &&
+
+	# The test is about logoutputencoding not affecting the
+	# final outcome -- it is used internally to generate the
+	# patch and the log.
+
+	git repo-config i18n.logoutputencoding UTF-8 &&
+
+	# The result will be committed by GIT_COMMITTER_NAME --
+	# we want UTF-8 encoded name.
+	. ../t3901-utf8.txt &&
+	git checkout -b test &&
+	git-rebase master &&
+
+	check_encoding 2
+'
+
+test_expect_success 'rebase (U/L)' '
+	git-repo-config i18n.commitencoding UTF-8 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-utf8.txt &&
+
+	git reset --hard side &&
+	git-rebase master &&
+
+	check_encoding 2
+'
+
+test_expect_success 'rebase (L/L)' '
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard side &&
+	git-rebase master &&
+
+	check_encoding 2 8859
+'
+
+test_expect_success 'rebase (L/U)' '
+	# This is pathological -- use UTF-8 as intermediate form
+	# to get ISO-8859-1 results.
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding UTF-8 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard side &&
+	git-rebase master &&
+
+	check_encoding 2 8859
+'
+
+test_expect_success 'cherry-pick(U/U)' '
+	# Both the commitencoding and logoutputencoding is set to UTF-8.
+
+	git-repo-config i18n.commitencoding UTF-8 &&
+	git repo-config i18n.logoutputencoding UTF-8 &&
+	. ../t3901-utf8.txt &&
+
+	git reset --hard master &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	EDITOR=: VISUAL=: git revert HEAD &&
+
+	check_encoding 3
+'
+
+test_expect_success 'cherry-pick(L/L)' '
+	# Both the commitencoding and logoutputencoding is set to ISO-8859-1
+
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard master &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	EDITOR=: VISUAL=: git revert HEAD &&
+
+	check_encoding 3 8859
+'
+
+test_expect_success 'cherry-pick(U/L)' '
+	# Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
+
+	git-repo-config i18n.commitencoding UTF-8 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-utf8.txt &&
+
+	git reset --hard master &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	EDITOR=: VISUAL=: git revert HEAD &&
+
+	check_encoding 3
+'
+
+test_expect_success 'cherry-pick(L/U)' '
+	# Again, the commitencoding is set to ISO-8859-1 but
+	# logoutputencoding is set to UTF-8.
+
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding UTF-8 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard master &&
+	git cherry-pick side^ &&
+	git cherry-pick side &&
+	EDITOR=: VISUAL=: git revert HEAD &&
+
+	check_encoding 3 8859
+'
+
+test_expect_success 'rebase --merge (U/U)' '
+	git-repo-config i18n.commitencoding UTF-8 &&
+	git repo-config i18n.logoutputencoding UTF-8 &&
+	. ../t3901-utf8.txt &&
+
+	git reset --hard side &&
+	git-rebase --merge master &&
+
+	check_encoding 2
+'
+
+test_expect_success 'rebase --merge (U/L)' '
+	git-repo-config i18n.commitencoding UTF-8 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-utf8.txt &&
+
+	git reset --hard side &&
+	git-rebase --merge master &&
+
+	check_encoding 2
+'
+
+test_expect_success 'rebase --merge (L/L)' '
+	# In this test we want ISO-8859-1 encoded commits as the result
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding ISO-8859-1 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard side &&
+	git-rebase --merge master &&
+
+	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.
+	git-repo-config i18n.commitencoding ISO-8859-1 &&
+	git repo-config i18n.logoutputencoding UTF-8 &&
+	. ../t3901-8859-1.txt &&
+
+	git reset --hard side &&
+	git-rebase --merge master &&
+
+	check_encoding 2 8859
+'
+
+test_done
diff --git a/t/t3901-utf8.txt b/t/t3901-utf8.txt
new file mode 100755
index 0000000..5f5205c
--- /dev/null
+++ b/t/t3901-utf8.txt
@@ -0,0 +1,4 @@
+: to be sourced in t3901 -- this is utf8
+GIT_AUTHOR_NAME="Áéí óú" &&
+GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME &&
+export GIT_AUTHOR_NAME GIT_COMMITTER_NAME