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 a9ba2d9aae0427edcd6bc62c98aaee7d05090f9c..44885b850c4a1c3a09b8b078a643cf7cd8918213 100755 (executable)
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -6,18 +6,37 @@ test_description='test git-http-backend-noserver'
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
 
 run_backend() {
-       REQUEST_METHOD=GET \
+       echo "$2" |
+       QUERY_STRING="${1#*\?}" \
        GIT_PROJECT_ROOT="$HTTPD_DOCUMENT_ROOT_PATH" \
-       PATH_INFO="$1" \
+       PATH_INFO="${1%%\?*}" \
        git http-backend >act.out 2>act.err
 }
 
 GET() {
-       return 0
+       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
+       fi
+       printf "Status: $2\r\n" >exp &&
+       test_cmp exp act
 }
 
 POST() {
-       return 0
+       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
+       fi
+       printf "Status: $3\r\n" >exp &&
+       test_cmp exp act
 }
 
 log_div() {
@@ -27,6 +46,7 @@ log_div() {
 . "$TEST_DIRECTORY"/t556x_common
 
 expect_aliased() {
+       export REQUEST_METHOD="GET" &&
        if test $1 = 0; then
                run_backend "$2"
        else
@@ -34,6 +54,7 @@ expect_aliased() {
                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' '