Re: [PATCHv4 09/15] t5602 (clone-remote-exec): add missing &&

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 1, 2010, 11:34 UTC
Message-ID: <20101001113412.GH6816@burratino>
In-Reply-To: <7vzkv0mkn5.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

> Elijah Newren <newren@gmail.com> writes:

Show 6 quoted lines

>> +	GIT_SSH=./not_ssh test_must_fail git clone localhost:/path/to/repo junk &&
>
> I think this suffers from the same issue that have been fixed with 09b78bc
> (t7502-commit.sh: rearrange test to make more portable, 2008-07-22) and
> 2d60615 (tests: Avoid single-shot environment export for shell function
> invocation, 2009-01-26).

Here's a patch for squashing.

Thanks again.

diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh
index 6aa6e0d..3f353d9 100755
--- a/t/t5602-clone-remote-exec.sh
+++ b/t/t5602-clone-remote-exec.sh
@@ -12,13 +12,21 @@ test_expect_success setup '
 '
 
 test_expect_success 'clone calls git upload-pack unqualified with no -u option' '
-	GIT_SSH=./not_ssh test_must_fail git clone localhost:/path/to/repo junk &&
+	(
+		GIT_SSH=./not_ssh &&
+		export GIT_SSH &&
+		test_must_fail git clone localhost:/path/to/repo junk
+	) &&
 	echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected &&
 	test_cmp expected not_ssh_output
 '
 
 test_expect_success 'clone calls specified git upload-pack with -u option' '
-	GIT_SSH=./not_ssh test_must_fail git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
+	(
+		GIT_SSH=./not_ssh &&
+		export GIT_SSH &&
+		test_must_fail git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk
+	) &&
 	echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected &&
 	test_cmp expected not_ssh_output
 '