Merge branch 'po/describe-not-necessarily-7'

diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index b0779d3623910b283662ea6f73f678aa85c3bfb1..7c9511c593c175b5065970b75319c6da03d68b31 100755 (executable)
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -4,6 +4,9 @@ test_description='test git wire-protocol transition'
 
 TEST_NO_CREATE_REPO=1
 
+# This is a protocol-specific test.
+GIT_TEST_PROTOCOL_VERSION=
+
 . ./test-lib.sh
 
 # Test protocol v1 with 'git://' transport
@@ -147,6 +150,8 @@ test_expect_success 'push with file:// using protocol v1' '
 test_expect_success 'setup ssh wrapper' '
        GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
        export GIT_SSH &&
+       GIT_SSH_VARIANT=ssh &&
+       export GIT_SSH_VARIANT &&
        export TRASH_DIRECTORY &&
        >"$TRASH_DIRECTORY"/ssh-output
 '
@@ -287,6 +292,4 @@ test_expect_success 'push with http:// using protocol v1' '
        grep "git< version 1" log
 '
 
-stop_httpd
-
 test_done