summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJakub Narebski <jnareb@gmail.com>2011-02-27 16:58:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-27 23:36:33 (GMT)
commite5ea66f9e545588c92cf228cca16f0b52d467bb5 (patch)
treeeda14dd1aa36fb931318810140219e7c4b46dff1 /t
parent6e7293e3ed0e29fd55bb2b4b1224613e4f38fed0 (diff)
downloadgit-e5ea66f9e545588c92cf228cca16f0b52d467bb5.zip
git-e5ea66f9e545588c92cf228cca16f0b52d467bb5.tar.gz
git-e5ea66f9e545588c92cf228cca16f0b52d467bb5.tar.bz2
gitweb: Make i18n (encoding) tests in t9500 leave clean state
The most important issue is that after unsetting `i18n.commitencoding' config variable t9500 no longer will use author and comitter name containing ISO-8859-1 characters, which are invalid UTF-8 characters. Besides it is good practice in general to clean up the state in tests. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t9500-gitweb-standalone-no-errors.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 35c151d..afac5b5 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -446,6 +446,8 @@ test_expect_success \
test_expect_success \
'encode(commit): utf8' \
'. "$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 &&
git add file &&
git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
@@ -454,11 +456,13 @@ test_expect_success \
test_expect_success \
'encode(commit): iso-8859-1' \
'. "$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 &&
git add file &&
git config i18n.commitencoding ISO-8859-1 &&
+ test_when_finished "git config --unset i18n.commitencoding" &&
git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
- git config --unset i18n.commitencoding &&
gitweb_run "p=.git;a=commit"'
test_expect_success \