Merge branch 'tp/completion'

diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index 24bf0ee0184bab6f3703f17f280e413041d2a686..7655da3f8d5e68f293ae5afe2d58dd41b1396f37 100755 (executable)
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -14,7 +14,7 @@ check_encoding () {
        do
                git format-patch --encoding=UTF-8 --stdout HEAD~$i..HEAD~$j |
                grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" &&
-               git-cat-file commit HEAD~$j |
+               git cat-file commit HEAD~$j |
                case "$header" in
                8859)
                        grep "^encoding ISO-8859-1" ;;
@@ -31,11 +31,11 @@ check_encoding () {
 }
 
 test_expect_success setup '
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
 
        # use UTF-8 in author and committer name to match the
        # i18n.commitencoding settings
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        test_tick &&
        echo "$GIT_AUTHOR_NAME" >mine &&
@@ -55,20 +55,20 @@ test_expect_success setup '
        git commit -s -m "Second on side" &&
 
        # the second one on the side branch is ISO-8859-1
-       git-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        # use author and committer name in ISO-8859-1 to match it.
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
        test_tick &&
        echo Yet another >theirs &&
        git add theirs &&
        git commit -s -m "Third on side" &&
 
        # Back to default
-       git-config i18n.commitencoding UTF-8
+       git config i18n.commitencoding UTF-8
 '
 
 test_expect_success 'format-patch output (ISO-8859-1)' '
-       git-config i18n.logoutputencoding ISO-8859-1 &&
+       git config i18n.logoutputencoding ISO-8859-1 &&
 
        git format-patch --stdout master..HEAD^ >out-l1 &&
        git format-patch --stdout HEAD^ >out-l2 &&
@@ -91,7 +91,7 @@ test_expect_success 'format-patch output (UTF-8)' '
 
 test_expect_success 'rebase (U/U)' '
        # We want the result of rebase in UTF-8
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
 
        # The test is about logoutputencoding not affecting the
        # final outcome -- it is used internally to generate the
@@ -101,32 +101,32 @@ test_expect_success 'rebase (U/U)' '
 
        # The result will be committed by GIT_COMMITTER_NAME --
        # we want UTF-8 encoded name.
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
        git checkout -b test &&
-       git-rebase master &&
+       git rebase master &&
 
        check_encoding 2
 '
 
 test_expect_success 'rebase (U/L)' '
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        git reset --hard side &&
-       git-rebase master &&
+       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-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard side &&
-       git-rebase master &&
+       git rebase master &&
 
        check_encoding 2 8859
 '
@@ -134,12 +134,12 @@ test_expect_success 'rebase (L/L)' '
 test_expect_success 'rebase (L/U)' '
        # This is pathological -- use UTF-8 as intermediate form
        # to get ISO-8859-1 results.
-       git-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard side &&
-       git-rebase master &&
+       git rebase master &&
 
        check_encoding 2 8859
 '
@@ -147,14 +147,14 @@ test_expect_success 'rebase (L/U)' '
 test_expect_success 'cherry-pick(U/U)' '
        # Both the commitencoding and logoutputencoding is set to UTF-8.
 
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3
 '
@@ -162,14 +162,14 @@ test_expect_success 'cherry-pick(U/U)' '
 test_expect_success 'cherry-pick(L/L)' '
        # Both the commitencoding and logoutputencoding is set to ISO-8859-1
 
-       git-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3 8859
 '
@@ -177,14 +177,14 @@ test_expect_success 'cherry-pick(L/L)' '
 test_expect_success 'cherry-pick(U/L)' '
        # Commitencoding is set to UTF-8 but logoutputencoding is ISO-8859-1
 
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3
 '
@@ -193,48 +193,48 @@ test_expect_success 'cherry-pick(L/U)' '
        # Again, the commitencoding is set to ISO-8859-1 but
        # logoutputencoding is set to UTF-8.
 
-       git-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard master &&
        git cherry-pick side^ &&
        git cherry-pick side &&
-       EDITOR=: VISUAL=: git revert HEAD &&
+       git revert HEAD &&
 
        check_encoding 3 8859
 '
 
 test_expect_success 'rebase --merge (U/U)' '
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        git reset --hard side &&
-       git-rebase --merge master &&
+       git rebase --merge master &&
 
        check_encoding 2
 '
 
 test_expect_success 'rebase --merge (U/L)' '
-       git-config i18n.commitencoding UTF-8 &&
+       git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
 
        git reset --hard side &&
-       git-rebase --merge master &&
+       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-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding ISO-8859-1 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard side &&
-       git-rebase --merge master &&
+       git rebase --merge master &&
 
        check_encoding 2 8859
 '
@@ -242,12 +242,12 @@ test_expect_success 'rebase --merge (L/L)' '
 test_expect_success 'rebase --merge (L/U)' '
        # This is pathological -- use UTF-8 as intermediate form
        # to get ISO-8859-1 results.
-       git-config i18n.commitencoding ISO-8859-1 &&
+       git config i18n.commitencoding ISO-8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
-       . ../t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
 
        git reset --hard side &&
-       git-rebase --merge master &&
+       git rebase --merge master &&
 
        check_encoding 2 8859
 '