From: Pat Thoyts Date: Sun, 12 Sep 2010 09:37:24 +0000 (+0100) Subject: Do not strip CR when grepping HTTP headers. X-Git-Tag: v1.7.4-rc0~193^2~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a94114ad;p=git.git Do not strip CR when grepping HTTP headers. By default, MSYS grep reads in text-mode and converts CRLF into LF line endings. For testing HTTP use binary mode (-U) as checking is done for CR in HTTP headers Signed-off-by: Eric Sunshine Signed-off-by: Pat Thoyts --- diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index 44885b850..4b0364374 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -5,6 +5,8 @@ test_description='test git-http-backend-noserver' HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY" +test_have_prereq MINGW && export GREP_OPTIONS=-U + run_backend() { echo "$2" | QUERY_STRING="${1#*\?}" \ diff --git a/t/test-lib.sh b/t/test-lib.sh index a85e7954a..2af8f10c8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -970,6 +970,7 @@ case $(uname -s) in # no POSIX permissions # backslashes in pathspec are converted to '/' # exec does not inherit the PID + test_set_prereq MINGW ;; *) test_set_prereq POSIXPERM