summaryrefslogtreecommitdiff
path: root/t/lib-git-p4.sh
diff options
context:
space:
mode:
authorkazuki saitoh <ksaitoh560@gmail.com>2013-08-10 16:15:12 -0400
committerJunio C Hamano <gitster@pobox.com>2013-08-11 23:19:08 -0700
commit799460316b87c2b0f26c3c0fcd99ae153f9f7358 (patch)
treeaefdf78974768d3086081d40566dc979ac652105 /t/lib-git-p4.sh
parent96cb27a9d2db3c01b8e296a0fbc1da1da09d1412 (diff)
downloadgit-799460316b87c2b0f26c3c0fcd99ae153f9f7358.tar.gz
git p4 test: sanitize P4CHARSET
In the tests, p4d is started without using "internationalized mode". Make sure this environment variable is unset, otherwise a mis-matched user setting would break the tests. The error message would be "Unicode clients require a unicode enabled server." [pw: use unset, add commit text] Signed-off-by: Kazuki Saitoh <ksaitoh560@gmail.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/lib-git-p4.sh')
-rw-r--r--t/lib-git-p4.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 2098b9ba05..ccd918e79e 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -48,7 +48,8 @@ P4DPORT=$((10669 + ($testid - $git_p4_test_start)))
P4PORT=localhost:$P4DPORT
P4CLIENT=client
P4EDITOR=:
-export P4PORT P4CLIENT P4EDITOR
+unset P4CHARSET
+export P4PORT P4CLIENT P4EDITOR P4CHARSET
db="$TRASH_DIRECTORY/db"
cli="$TRASH_DIRECTORY/cli"