git p4 test: keep P4CLIENT changes inside subshells

Tests assume that this is set to something valid.  Make sure
that the 'clone --use-client-spec' does not leak its changes
out into the rest of the tests.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 3b0000fab26fad322ff99812441dd83023f2f231..8d914a5766f2ebe3a0a3a2095a6ddf24fe1025c5 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -226,9 +226,11 @@ test_expect_success 'clone --use-client-spec' '
                View: //depot/sub/... //client2/bus/...
                EOF
        ) &&
                View: //depot/sub/... //client2/bus/...
                EOF
        ) &&

-       P4CLIENT=client2 &&

        test_when_finished cleanup_git &&
        test_when_finished cleanup_git &&

-       git p4 clone --dest="$git" --use-client-spec //depot/... &&
+       (
+               P4CLIENT=client2 &&
+               git p4 clone --dest="$git" --use-client-spec //depot/...
+       ) &&

        (
                cd "$git" &&
                test_path_is_file bus/dir/f4 &&
        (
                cd "$git" &&
                test_path_is_file bus/dir/f4 &&


@@ -241,6 +243,7 @@ test_expect_success 'clone --use-client-spec' '
                cd "$git" &&
                git init &&
                git config git-p4.useClientSpec true &&
                cd "$git" &&
                git init &&
                git config git-p4.useClientSpec true &&

+               P4CLIENT=client2 &&

                git p4 sync //depot/... &&
                git checkout -b master p4/master &&
                test_path_is_file bus/dir/f4 &&
                git p4 sync //depot/... &&
                git checkout -b master p4/master &&
                test_path_is_file bus/dir/f4 &&