Merge branch 'nd/magic-pathspec'

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 2098b9ba053b09b00ed4382aa55ea0802d749d89..ccd918e79ef4fa7962984c5ed4890ec07e92f03a 100644 (file)
--- 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"