Merge branch 'maint' into bc/master-diff-hunk-header-fix

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index f4f41847f32ca253d5b79a4dd3ff1e4a533d02e1..784c31aec99d90b69186079ddb66350d9f4a8827 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -18,7 +18,7 @@ test_expect_success setup '
        T=$(git write-tree) &&
        C=$(git commit-tree $T <"$TEST_DIRECTORY"/t3900/1-UTF-8.txt) &&
        git update-ref HEAD $C &&
-       git-tag C0
+       git tag C0
 '
 
 test_expect_success 'no encoding header for base case' '
@@ -30,9 +30,9 @@ for H in ISO-8859-1 EUCJP ISO-2022-JP
 do
        test_expect_success "$H setup" '
                git config i18n.commitencoding $H &&
-               git-checkout -b $H C0 &&
+               git checkout -b $H C0 &&
                echo $H >F &&
-               git-commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
+               git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
        '
 done