From af8c0092503f677afc9ea4070ebd9204133b83ab Mon Sep 17 00:00:00 2001 From: Pete Wyckoff Date: Mon, 14 Jan 2013 19:47:07 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- t/t9806-git-p4-options.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh index 3b0000fab..8d914a576 100755 --- 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 ) && - P4CLIENT=client2 && 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 && @@ -241,6 +243,7 @@ test_expect_success 'clone --use-client-spec' ' 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 && -- 2.11.0