t3901: move supporting files into t/t3901/

The current convention is to either generate files on the fly in tests,
or to use supporting files taken from a t/tNNNN/ directory (where NNNN
matches the test's number, or the number of the test from which we
borrow supporting files).

The test t3901-i18n-patch.sh was obviously introduced before that
convention was in full swing, hence its supporting files still lived in
t/t3901-8859-1.txt and t/t3901-utf8.txt, respectively.

Let's adjust to the current convention.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0203-gettext-setlocale-sanity.sh b/t/t0203-gettext-setlocale-sanity.sh
index a2124600811618efc2c79d7a3b8d04c9bb838fc8..71b0d74b4ddef584e3f8af711df6b5c5678034c5 100755 (executable)
--- a/t/t0203-gettext-setlocale-sanity.sh
+++ b/t/t0203-gettext-setlocale-sanity.sh
@@ -8,7 +8,7 @@ test_description="The Git C functions aren't broken by setlocale(3)"
 . ./lib-gettext.sh
 
 test_expect_success 'git show a ISO-8859-1 commit under C locale' '
 . ./lib-gettext.sh
 
 test_expect_success 'git show a ISO-8859-1 commit under C locale' '

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

        test_commit "iso-c-commit" iso-under-c &&
        git show >out 2>err &&
        ! test -s err &&
        test_commit "iso-c-commit" iso-under-c &&
        git show >out 2>err &&
        ! test -s err &&


@@ -16,7 +16,7 @@ test_expect_success 'git show a ISO-8859-1 commit under C locale' '
 '
 
 test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 locale' '
 '
 
 test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 locale' '

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

        test_commit "iso-utf8-commit" iso-under-utf8 &&
        LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
        ! test -s err &&
        test_commit "iso-utf8-commit" iso-under-utf8 &&
        LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err &&
        ! test -s err &&

diff --git a/t/t3901-8859-1.txt b/t/t3901-8859-1.txt
deleted file mode 100755 (executable)
index 38c21a6..0000000
--- a/t/t3901-8859-1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-: 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
index f663d567c8ac89e59236df79a632cbd2609910f5..923eb01f0ea4bec0d3a7d96a2492a0755ad00ef9 100755 (executable)
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -31,7 +31,7 @@ test_expect_success setup '
 
        # use UTF-8 in author and committer name to match the
        # i18n.commitencoding settings
 
        # use UTF-8 in author and committer name to match the
        # i18n.commitencoding settings

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        test_tick &&
        echo "$GIT_AUTHOR_NAME" >mine &&
 
        test_tick &&
        echo "$GIT_AUTHOR_NAME" >mine &&


@@ -55,7 +55,7 @@ test_expect_success setup '
                # 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.
                # 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.

-               . "$TEST_DIRECTORY"/t3901-8859-1.txt
+               . "$TEST_DIRECTORY"/t3901/8859-1.txt

        fi &&
        test_tick &&
        echo Yet another >theirs &&
        fi &&
        test_tick &&
        echo Yet another >theirs &&


@@ -100,7 +100,7 @@ test_expect_success 'rebase (U/U)' '
 
        # The result will be committed by GIT_COMMITTER_NAME --
        # we want UTF-8 encoded name.
 
        # The result will be committed by GIT_COMMITTER_NAME --
        # we want UTF-8 encoded name.

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

        git checkout -b test &&
        git rebase master &&
 
        git checkout -b test &&
        git rebase master &&
 


@@ -110,7 +110,7 @@ test_expect_success 'rebase (U/U)' '
 test_expect_success 'rebase (U/L)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&
 test_expect_success 'rebase (U/L)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard side &&
        git rebase master &&
 
        git reset --hard side &&
        git rebase master &&


@@ -122,7 +122,7 @@ test_expect_success !MINGW 'rebase (L/L)' '
        # In this test we want ISO-8859-1 encoded commits as the result
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&
        # In this test we want ISO-8859-1 encoded commits as the result
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard side &&
        git rebase master &&
 
        git reset --hard side &&
        git rebase master &&


@@ -135,7 +135,7 @@ test_expect_success !MINGW 'rebase (L/U)' '
        # to get ISO-8859-1 results.
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
        # to get ISO-8859-1 results.
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard side &&
        git rebase master &&
 
        git reset --hard side &&
        git rebase master &&


@@ -148,7 +148,7 @@ test_expect_success 'cherry-pick(U/U)' '
 
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&
 
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard master &&
        git cherry-pick side^ &&
 
        git reset --hard master &&
        git cherry-pick side^ &&


@@ -163,7 +163,7 @@ test_expect_success !MINGW 'cherry-pick(L/L)' '
 
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&
 
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard master &&
        git cherry-pick side^ &&
 
        git reset --hard master &&
        git cherry-pick side^ &&


@@ -178,7 +178,7 @@ test_expect_success 'cherry-pick(U/L)' '
 
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&
 
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard master &&
        git cherry-pick side^ &&
 
        git reset --hard master &&
        git cherry-pick side^ &&


@@ -194,7 +194,7 @@ test_expect_success !MINGW 'cherry-pick(L/U)' '
 
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
 
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard master &&
        git cherry-pick side^ &&
 
        git reset --hard master &&
        git cherry-pick side^ &&


@@ -207,7 +207,7 @@ test_expect_success !MINGW 'cherry-pick(L/U)' '
 test_expect_success 'rebase --merge (U/U)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&
 test_expect_success 'rebase --merge (U/U)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard side &&
        git rebase --merge master &&
 
        git reset --hard side &&
        git rebase --merge master &&


@@ -218,7 +218,7 @@ test_expect_success 'rebase --merge (U/U)' '
 test_expect_success 'rebase --merge (U/L)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&
 test_expect_success 'rebase --merge (U/L)' '
        git config i18n.commitencoding UTF-8 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard side &&
        git rebase --merge master &&
 
        git reset --hard side &&
        git rebase --merge master &&


@@ -230,7 +230,7 @@ test_expect_success 'rebase --merge (L/L)' '
        # In this test we want ISO-8859-1 encoded commits as the result
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&
        # In this test we want ISO-8859-1 encoded commits as the result
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard side &&
        git rebase --merge master &&
 
        git reset --hard side &&
        git rebase --merge master &&


@@ -243,7 +243,7 @@ test_expect_success 'rebase --merge (L/U)' '
        # to get ISO-8859-1 results.
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&
        # to get ISO-8859-1 results.
        git config i18n.commitencoding ISO8859-1 &&
        git config i18n.logoutputencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard side &&
        git rebase --merge master &&
 
        git reset --hard side &&
        git rebase --merge master &&


@@ -254,7 +254,7 @@ test_expect_success 'rebase --merge (L/U)' '
 test_expect_success 'am (U/U)' '
        # Apply UTF-8 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&
 test_expect_success 'am (U/U)' '
        # Apply UTF-8 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard master &&
        git am out-u1 out-u2 &&
 
        git reset --hard master &&
        git am out-u1 out-u2 &&


@@ -265,7 +265,7 @@ test_expect_success 'am (U/U)' '
 test_expect_success !MINGW 'am (L/L)' '
        # Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
        git config i18n.commitencoding ISO8859-1 &&
 test_expect_success !MINGW 'am (L/L)' '
        # Apply ISO-8859-1 patches with ISO-8859-1 commitencoding
        git config i18n.commitencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard master &&
        git am out-l1 out-l2 &&
 
        git reset --hard master &&
        git am out-l1 out-l2 &&


@@ -276,7 +276,7 @@ test_expect_success !MINGW 'am (L/L)' '
 test_expect_success 'am (U/L)' '
        # Apply ISO-8859-1 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&
 test_expect_success 'am (U/L)' '
        # Apply ISO-8859-1 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

        git reset --hard master &&
 
        # am specifies --utf8 by default.
        git reset --hard master &&
 
        # am specifies --utf8 by default.


@@ -288,7 +288,7 @@ test_expect_success 'am (U/L)' '
 test_expect_success 'am --no-utf8 (U/L)' '
        # Apply ISO-8859-1 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&
 test_expect_success 'am --no-utf8 (U/L)' '
        # Apply ISO-8859-1 patches with UTF-8 commitencoding
        git config i18n.commitencoding UTF-8 &&

-       . "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       . "$TEST_DIRECTORY"/t3901/utf8.txt &&

 
        git reset --hard master &&
        git am --no-utf8 out-l1 out-l2 2>err &&
 
        git reset --hard master &&
        git am --no-utf8 out-l1 out-l2 2>err &&


@@ -303,7 +303,7 @@ test_expect_success 'am --no-utf8 (U/L)' '
 test_expect_success !MINGW 'am (L/U)' '
        # Apply UTF-8 patches with ISO-8859-1 commitencoding
        git config i18n.commitencoding ISO8859-1 &&
 test_expect_success !MINGW 'am (L/U)' '
        # Apply UTF-8 patches with ISO-8859-1 commitencoding
        git config i18n.commitencoding ISO8859-1 &&

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

 
        git reset --hard master &&
        # mailinfo will re-code the commit message to the charset specified by
 
        git reset --hard master &&
        # mailinfo will re-code the commit message to the charset specified by

diff --git a/t/t3901-utf8.txt b/t/t3901-utf8.txt
deleted file mode 100755 (executable)
index 5f5205c..0000000
--- a/t/t3901-utf8.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-: to be sourced in t3901 -- this is utf8
-GIT_AUTHOR_NAME="Áéí óú" &&
-GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME &&
-export GIT_AUTHOR_NAME GIT_COMMITTER_NAME

diff --git a/t/t3901/8859-1.txt b/t/t3901/8859-1.txt
new file mode 100755 (executable)
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/utf8.txt b/t/t3901/utf8.txt
new file mode 100755 (executable)
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

diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index b5149fde6ecda2b3de5ed60f43c60ab70230289c..8dcb05c4a5711e95bb64d8ba310e3490744fc015 100755 (executable)
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -70,7 +70,7 @@ test_expect_success 'iso-8859-1' '
 
        git config i18n.commitencoding ISO8859-1 &&
        # use author and committer name in ISO-8859-1 to match it.
 
        git config i18n.commitencoding ISO8859-1 &&
        # use author and committer name in ISO-8859-1 to match it.

-       . "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       . "$TEST_DIRECTORY"/t3901/8859-1.txt &&

        test_tick &&
        echo rosten >file &&
        git commit -s -m den file &&
        test_tick &&
        echo rosten >file &&
        git commit -s -m den file &&

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 6d06ed96cbc37ee0d19173a4c5379e021c1e5414..cc8d463e01ac74a78fa08b638318a88b8ea98bff 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -519,7 +519,7 @@ test_expect_success \
 
 test_expect_success \
        'encode(commit): utf8' \
 
 test_expect_success \
        'encode(commit): utf8' \

-       '. "$TEST_DIRECTORY"/t3901-utf8.txt &&
+       '. "$TEST_DIRECTORY"/t3901/utf8.txt &&

         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "UTF-8" >> file &&
         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "UTF-8" >> file &&


@@ -529,7 +529,7 @@ test_expect_success \
 
 test_expect_success \
        'encode(commit): iso-8859-1' \
 
 test_expect_success \
        'encode(commit): iso-8859-1' \

-       '. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+       '. "$TEST_DIRECTORY"/t3901/8859-1.txt &&

         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "ISO-8859-1" >> file &&
         test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
         test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "ISO-8859-1" >> file &&