From: kazuki saitoh <ksaitoh560@gmail.com>
Date: Sat, 10 Aug 2013 20:15:12 +0000 (-0400)
Subject: git p4 test: sanitize P4CHARSET
X-Git-Tag: v1.8.5-rc0~114^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/799460316b87c2b0f26c3c0fcd99ae153f9f7358?ds=inline;hp=--cc

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>
---

799460316b87c2b0f26c3c0fcd99ae153f9f7358
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"