Merge branch 'jh/maint-submodule-status-in-void'

diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 5f8c88e26112fd39a0a2d1926f300fb944ca9032..44885b850c4a1c3a09b8b078a643cf7cd8918213 100755 (executable)
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -14,8 +14,9 @@ run_backend() {
 }
 
 GET() {
-       REQUEST_METHOD="GET" \
+       export REQUEST_METHOD="GET" &&
        run_backend "/repo.git/$1" &&
+       unset REQUEST_METHOD &&
        if ! grep "Status" act.out >act
        then
                printf "Status: 200 OK\r\n" >act
@@ -25,9 +26,11 @@ GET() {
 }
 
 POST() {
-       REQUEST_METHOD="POST" \
-       CONTENT_TYPE="application/x-$1-request" \
+       export REQUEST_METHOD="POST" &&
+       export CONTENT_TYPE="application/x-$1-request" &&
        run_backend "/repo.git/$1" "$2" &&
+       unset REQUEST_METHOD &&
+       unset CONTENT_TYPE &&
        if ! grep "Status" act.out >act
        then
                printf "Status: 200 OK\r\n" >act
@@ -43,13 +46,15 @@ log_div() {
 . "$TEST_DIRECTORY"/t556x_common
 
 expect_aliased() {
+       export REQUEST_METHOD="GET" &&
        if test $1 = 0; then
-               REQUEST_METHOD=GET run_backend "$2"
+               run_backend "$2"
        else
-               REQUEST_METHOD=GET run_backend "$2" &&
+               run_backend "$2" &&
                echo "fatal: '$2': aliased" >exp.err &&
                test_cmp exp.err act.err
        fi
+       unset REQUEST_METHOD
 }
 
 test_expect_success 'http-backend blocks bad PATH_INFO' '