freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Johannes Schindelin and committed by
Junio C Hamano 8a7f8bed cedf4e27

+24 -24
+2 -2
t/t0203-gettext-setlocale-sanity.sh
··· 8 . ./lib-gettext.sh 9 10 test_expect_success 'git show a ISO-8859-1 commit under C locale' ' 11 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 12 test_commit "iso-c-commit" iso-under-c && 13 git show >out 2>err && 14 ! test -s err && ··· 16 ' 17 18 test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 locale' ' 19 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 20 test_commit "iso-utf8-commit" iso-under-utf8 && 21 LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err && 22 ! test -s err &&
··· 8 . ./lib-gettext.sh 9 10 test_expect_success 'git show a ISO-8859-1 commit under C locale' ' 11 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 12 test_commit "iso-c-commit" iso-under-c && 13 git show >out 2>err && 14 ! test -s err && ··· 16 ' 17 18 test_expect_success GETTEXT_LOCALE 'git show a ISO-8859-1 commit under a UTF-8 locale' ' 19 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 20 test_commit "iso-utf8-commit" iso-under-utf8 && 21 LANGUAGE=is LC_ALL="$is_IS_locale" git show >out 2>err && 22 ! test -s err &&
t/t3901-8859-1.txt t/t3901/8859-1.txt
+19 -19
t/t3901-i18n-patch.sh
··· 31 32 # use UTF-8 in author and committer name to match the 33 # i18n.commitencoding settings 34 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 35 36 test_tick && 37 echo "$GIT_AUTHOR_NAME" >mine && ··· 55 # the second one on the side branch is ISO-8859-1 56 git config i18n.commitencoding ISO8859-1 && 57 # use author and committer name in ISO-8859-1 to match it. 58 - . "$TEST_DIRECTORY"/t3901-8859-1.txt 59 fi && 60 test_tick && 61 echo Yet another >theirs && ··· 100 101 # The result will be committed by GIT_COMMITTER_NAME -- 102 # we want UTF-8 encoded name. 103 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 104 git checkout -b test && 105 git rebase master && 106 ··· 110 test_expect_success 'rebase (U/L)' ' 111 git config i18n.commitencoding UTF-8 && 112 git config i18n.logoutputencoding ISO8859-1 && 113 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 114 115 git reset --hard side && 116 git rebase master && ··· 122 # In this test we want ISO-8859-1 encoded commits as the result 123 git config i18n.commitencoding ISO8859-1 && 124 git config i18n.logoutputencoding ISO8859-1 && 125 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 126 127 git reset --hard side && 128 git rebase master && ··· 135 # to get ISO-8859-1 results. 136 git config i18n.commitencoding ISO8859-1 && 137 git config i18n.logoutputencoding UTF-8 && 138 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 139 140 git reset --hard side && 141 git rebase master && ··· 148 149 git config i18n.commitencoding UTF-8 && 150 git config i18n.logoutputencoding UTF-8 && 151 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 152 153 git reset --hard master && 154 git cherry-pick side^ && ··· 163 164 git config i18n.commitencoding ISO8859-1 && 165 git config i18n.logoutputencoding ISO8859-1 && 166 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 167 168 git reset --hard master && 169 git cherry-pick side^ && ··· 178 179 git config i18n.commitencoding UTF-8 && 180 git config i18n.logoutputencoding ISO8859-1 && 181 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 182 183 git reset --hard master && 184 git cherry-pick side^ && ··· 194 195 git config i18n.commitencoding ISO8859-1 && 196 git config i18n.logoutputencoding UTF-8 && 197 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 198 199 git reset --hard master && 200 git cherry-pick side^ && ··· 207 test_expect_success 'rebase --merge (U/U)' ' 208 git config i18n.commitencoding UTF-8 && 209 git config i18n.logoutputencoding UTF-8 && 210 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 211 212 git reset --hard side && 213 git rebase --merge master && ··· 218 test_expect_success 'rebase --merge (U/L)' ' 219 git config i18n.commitencoding UTF-8 && 220 git config i18n.logoutputencoding ISO8859-1 && 221 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 222 223 git reset --hard side && 224 git rebase --merge master && ··· 230 # In this test we want ISO-8859-1 encoded commits as the result 231 git config i18n.commitencoding ISO8859-1 && 232 git config i18n.logoutputencoding ISO8859-1 && 233 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 234 235 git reset --hard side && 236 git rebase --merge master && ··· 243 # to get ISO-8859-1 results. 244 git config i18n.commitencoding ISO8859-1 && 245 git config i18n.logoutputencoding UTF-8 && 246 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 247 248 git reset --hard side && 249 git rebase --merge master && ··· 254 test_expect_success 'am (U/U)' ' 255 # Apply UTF-8 patches with UTF-8 commitencoding 256 git config i18n.commitencoding UTF-8 && 257 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 258 259 git reset --hard master && 260 git am out-u1 out-u2 && ··· 265 test_expect_success !MINGW 'am (L/L)' ' 266 # Apply ISO-8859-1 patches with ISO-8859-1 commitencoding 267 git config i18n.commitencoding ISO8859-1 && 268 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 269 270 git reset --hard master && 271 git am out-l1 out-l2 && ··· 276 test_expect_success 'am (U/L)' ' 277 # Apply ISO-8859-1 patches with UTF-8 commitencoding 278 git config i18n.commitencoding UTF-8 && 279 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 280 git reset --hard master && 281 282 # am specifies --utf8 by default. ··· 288 test_expect_success 'am --no-utf8 (U/L)' ' 289 # Apply ISO-8859-1 patches with UTF-8 commitencoding 290 git config i18n.commitencoding UTF-8 && 291 - . "$TEST_DIRECTORY"/t3901-utf8.txt && 292 293 git reset --hard master && 294 git am --no-utf8 out-l1 out-l2 2>err && ··· 303 test_expect_success !MINGW 'am (L/U)' ' 304 # Apply UTF-8 patches with ISO-8859-1 commitencoding 305 git config i18n.commitencoding ISO8859-1 && 306 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 307 308 git reset --hard master && 309 # mailinfo will re-code the commit message to the charset specified by
··· 31 32 # use UTF-8 in author and committer name to match the 33 # i18n.commitencoding settings 34 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 35 36 test_tick && 37 echo "$GIT_AUTHOR_NAME" >mine && ··· 55 # the second one on the side branch is ISO-8859-1 56 git config i18n.commitencoding ISO8859-1 && 57 # use author and committer name in ISO-8859-1 to match it. 58 + . "$TEST_DIRECTORY"/t3901/8859-1.txt 59 fi && 60 test_tick && 61 echo Yet another >theirs && ··· 100 101 # The result will be committed by GIT_COMMITTER_NAME -- 102 # we want UTF-8 encoded name. 103 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 104 git checkout -b test && 105 git rebase master && 106 ··· 110 test_expect_success 'rebase (U/L)' ' 111 git config i18n.commitencoding UTF-8 && 112 git config i18n.logoutputencoding ISO8859-1 && 113 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 114 115 git reset --hard side && 116 git rebase master && ··· 122 # In this test we want ISO-8859-1 encoded commits as the result 123 git config i18n.commitencoding ISO8859-1 && 124 git config i18n.logoutputencoding ISO8859-1 && 125 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 126 127 git reset --hard side && 128 git rebase master && ··· 135 # to get ISO-8859-1 results. 136 git config i18n.commitencoding ISO8859-1 && 137 git config i18n.logoutputencoding UTF-8 && 138 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 139 140 git reset --hard side && 141 git rebase master && ··· 148 149 git config i18n.commitencoding UTF-8 && 150 git config i18n.logoutputencoding UTF-8 && 151 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 152 153 git reset --hard master && 154 git cherry-pick side^ && ··· 163 164 git config i18n.commitencoding ISO8859-1 && 165 git config i18n.logoutputencoding ISO8859-1 && 166 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 167 168 git reset --hard master && 169 git cherry-pick side^ && ··· 178 179 git config i18n.commitencoding UTF-8 && 180 git config i18n.logoutputencoding ISO8859-1 && 181 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 182 183 git reset --hard master && 184 git cherry-pick side^ && ··· 194 195 git config i18n.commitencoding ISO8859-1 && 196 git config i18n.logoutputencoding UTF-8 && 197 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 198 199 git reset --hard master && 200 git cherry-pick side^ && ··· 207 test_expect_success 'rebase --merge (U/U)' ' 208 git config i18n.commitencoding UTF-8 && 209 git config i18n.logoutputencoding UTF-8 && 210 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 211 212 git reset --hard side && 213 git rebase --merge master && ··· 218 test_expect_success 'rebase --merge (U/L)' ' 219 git config i18n.commitencoding UTF-8 && 220 git config i18n.logoutputencoding ISO8859-1 && 221 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 222 223 git reset --hard side && 224 git rebase --merge master && ··· 230 # In this test we want ISO-8859-1 encoded commits as the result 231 git config i18n.commitencoding ISO8859-1 && 232 git config i18n.logoutputencoding ISO8859-1 && 233 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 234 235 git reset --hard side && 236 git rebase --merge master && ··· 243 # to get ISO-8859-1 results. 244 git config i18n.commitencoding ISO8859-1 && 245 git config i18n.logoutputencoding UTF-8 && 246 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 247 248 git reset --hard side && 249 git rebase --merge master && ··· 254 test_expect_success 'am (U/U)' ' 255 # Apply UTF-8 patches with UTF-8 commitencoding 256 git config i18n.commitencoding UTF-8 && 257 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 258 259 git reset --hard master && 260 git am out-u1 out-u2 && ··· 265 test_expect_success !MINGW 'am (L/L)' ' 266 # Apply ISO-8859-1 patches with ISO-8859-1 commitencoding 267 git config i18n.commitencoding ISO8859-1 && 268 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 269 270 git reset --hard master && 271 git am out-l1 out-l2 && ··· 276 test_expect_success 'am (U/L)' ' 277 # Apply ISO-8859-1 patches with UTF-8 commitencoding 278 git config i18n.commitencoding UTF-8 && 279 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 280 git reset --hard master && 281 282 # am specifies --utf8 by default. ··· 288 test_expect_success 'am --no-utf8 (U/L)' ' 289 # Apply ISO-8859-1 patches with UTF-8 commitencoding 290 git config i18n.commitencoding UTF-8 && 291 + . "$TEST_DIRECTORY"/t3901/utf8.txt && 292 293 git reset --hard master && 294 git am --no-utf8 out-l1 out-l2 2>err && ··· 303 test_expect_success !MINGW 'am (L/U)' ' 304 # Apply UTF-8 patches with ISO-8859-1 commitencoding 305 git config i18n.commitencoding ISO8859-1 && 306 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 307 308 git reset --hard master && 309 # mailinfo will re-code the commit message to the charset specified by
t/t3901-utf8.txt t/t3901/utf8.txt
+1 -1
t/t9350-fast-export.sh
··· 70 71 git config i18n.commitencoding ISO8859-1 && 72 # use author and committer name in ISO-8859-1 to match it. 73 - . "$TEST_DIRECTORY"/t3901-8859-1.txt && 74 test_tick && 75 echo rosten >file && 76 git commit -s -m den file &&
··· 70 71 git config i18n.commitencoding ISO8859-1 && 72 # use author and committer name in ISO-8859-1 to match it. 73 + . "$TEST_DIRECTORY"/t3901/8859-1.txt && 74 test_tick && 75 echo rosten >file && 76 git commit -s -m den file &&
+2 -2
t/t9500-gitweb-standalone-no-errors.sh
··· 519 520 test_expect_success \ 521 'encode(commit): utf8' \ 522 - '. "$TEST_DIRECTORY"/t3901-utf8.txt && 523 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && 524 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && 525 echo "UTF-8" >> file && ··· 529 530 test_expect_success \ 531 'encode(commit): iso-8859-1' \ 532 - '. "$TEST_DIRECTORY"/t3901-8859-1.txt && 533 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && 534 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && 535 echo "ISO-8859-1" >> file &&
··· 519 520 test_expect_success \ 521 'encode(commit): utf8' \ 522 + '. "$TEST_DIRECTORY"/t3901/utf8.txt && 523 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && 524 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && 525 echo "UTF-8" >> file && ··· 529 530 test_expect_success \ 531 'encode(commit): iso-8859-1' \ 532 + '. "$TEST_DIRECTORY"/t3901/8859-1.txt && 533 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" && 534 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" && 535 echo "ISO-8859-1" >> file &&