test/send-email: --[no-]xmailer tests

diff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh
index 8367a6845f6ea3cdbc2f4f0e096144975fa3aef2..cbcceab9d56b591ee851374c9030a23a4c65a462 100755 (executable)
--- a/t/t5602-clone-remote-exec.sh
+++ b/t/t5602-clone-remote-exec.sh
@@ -5,21 +5,22 @@ test_description=clone
 . ./test-lib.sh
 
 test_expect_success setup '
-       echo "#!/bin/sh" > not_ssh
-       echo "echo \"\$*\" > not_ssh_output" >> not_ssh
-       echo "exit 1" >> not_ssh
+       echo "#!/bin/sh" > not_ssh &&
+       echo "echo \"\$*\" > not_ssh_output" >> not_ssh &&
+       echo "exit 1" >> not_ssh &&
        chmod +x not_ssh
 '
 
-test_expect_success 'clone calls git-upload-pack unqualified with no -u option' '
-       GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk
-       echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected
+test_expect_success 'clone calls git upload-pack unqualified with no -u option' '
+       test_must_fail env GIT_SSH=./not_ssh 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 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_expect_success 'clone calls specified git upload-pack with -u option' '
+       test_must_fail env GIT_SSH=./not_ssh \
+               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
 '