Fourth batch

diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 5f8c88e26112fd39a0a2d1926f300fb944ca9032..9fafcf194589218e28b894a7bd9e83c9a1893fbf 100755 (executable)
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -5,17 +5,23 @@ test_description='test git-http-backend-noserver'
 
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
 
+if test_have_prereq GREP_STRIPS_CR
+then
+       GREP_OPTIONS=-U
+       export GREP_OPTIONS
+fi
+
 run_backend() {
        echo "$2" |
-       QUERY_STRING="${1#*\?}" \
-       GIT_PROJECT_ROOT="$HTTPD_DOCUMENT_ROOT_PATH" \
-       PATH_INFO="${1%%\?*}" \
+       QUERY_STRING="${1#*[?]}" \
+       PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \
        git http-backend >act.out 2>act.err
 }
 
 GET() {
-       REQUEST_METHOD="GET" \
+       REQUEST_METHOD="GET" && export REQUEST_METHOD &&
        run_backend "/repo.git/$1" &&
+       sane_unset REQUEST_METHOD &&
        if ! grep "Status" act.out >act
        then
                printf "Status: 200 OK\r\n" >act
@@ -25,9 +31,11 @@ GET() {
 }
 
 POST() {
-       REQUEST_METHOD="POST" \
-       CONTENT_TYPE="application/x-$1-request" \
+       REQUEST_METHOD="POST" && export REQUEST_METHOD &&
+       CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
        run_backend "/repo.git/$1" "$2" &&
+       sane_unset REQUEST_METHOD &&
+       sane_unset CONTENT_TYPE &&
        if ! grep "Status" act.out >act
        then
                printf "Status: 200 OK\r\n" >act
@@ -36,20 +44,18 @@ POST() {
        test_cmp exp act
 }
 
-log_div() {
-       return 0
-}
-
 . "$TEST_DIRECTORY"/t556x_common
 
 expect_aliased() {
+       REQUEST_METHOD="GET" && export REQUEST_METHOD &&
        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' '