X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3900-i18n-commit.sh;h=ffddb68db3abbf1ab14bf99f3c9514a7ee0c276b;hb=b69ba460bb0710b2af8a20b4b0d62233f29401ec;hp=6714b0dd6e6164eb17174465be536ee3a07d88e1;hpb=9066f4ef2fe27b7636094c06d2361820cd31e03e;p=git.git

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 6714b0dd6..ffddb68db 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -9,7 +9,7 @@ test_description='commit and log output encodings'
 
 compare_with () {
 	git-show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
-	diff -u current "$2"
+	git diff current "$2"
 }
 
 test_expect_success setup '
@@ -29,7 +29,7 @@ test_expect_success 'no encoding header for base case' '
 for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
 	test_expect_success "$H setup" '
-		git-repo-config i18n.commitencoding $H &&
+		git-config i18n.commitencoding $H &&
 		git-checkout -b $H C0 &&
 		echo $H >F &&
 		git-commit -a -F ../t3900/$H.txt
@@ -44,16 +44,16 @@ do
 	'
 done
 
-test_expect_success 'repo-config to remove customization' '
-	git-repo-config --unset-all i18n.commitencoding &&
-	if Z=$(git-repo-config --get-all i18n.commitencoding)
+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-repo-config i18n.commitencoding utf-8
+	git-config i18n.commitencoding utf-8
 '
 
 test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
@@ -67,9 +67,9 @@ do
 	'
 done
 
-test_expect_success 'repo-config to add customization' '
-	git-repo-config --unset-all i18n.commitencoding &&
-	if Z=$(git-repo-config --get-all i18n.commitencoding)
+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
@@ -81,13 +81,13 @@ test_expect_success 'repo-config to add customization' '
 for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
 	test_expect_success "$H should be shown in itself now" '
-		git-repo-config i18n.commitencoding '$H' &&
+		git-config i18n.commitencoding '$H' &&
 		compare_with '$H' ../t3900/'$H'.txt
 	'
 done
 
-test_expect_success 'repo-config to tweak customization' '
-	git-repo-config i18n.logoutputencoding utf-8
+test_expect_success 'config to tweak customization' '
+	git-config i18n.logoutputencoding utf-8
 '
 
 test_expect_success 'ISO-8859-1 should be shown in UTF-8 now' '
@@ -103,7 +103,7 @@ done
 
 for J in EUCJP ISO-2022-JP
 do
-	git-repo-config i18n.logoutputencoding $J
+	git-config i18n.logoutputencoding $J
 	for H in EUCJP ISO-2022-JP
 	do
 		test_expect_success "$H should be shown in $J now" '