diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:44:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:44:50 -0700 |
| commit | 34022ba21af3ec7d44b34a94cb8f2b3879c6c95c (patch) | |
| tree | 370447bef15584ac9f5f5392834be0b37ce6a651 /t | |
| parent | 6c3456005359ccd94f991c8e306997c02a8f4b80 (diff) | |
| parent | 9d57c4a6977997aa8150b333fbe2b88988e392d3 (diff) | |
| download | git-34022ba21af3ec7d44b34a94cb8f2b3879c6c95c.tar.gz | |
Merge branch 'ks/p4-view-spec'
* ks/p4-view-spec:
git p4: implement view spec wildcards with "p4 where"
git p4 test: sanitize P4CHARSET
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-git-p4.sh | 3 |
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" |