aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2009-11-09 10:10:36 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-09 16:40:49 -0800
commit0a8fcbdca28f6c8dad3cac9aca48f866c84b0f11 (patch)
tree67b25132f11ac8bba5a932bd9aa4c1242ca11e0a
parent34b6cb8bb032bd16f3d1c93a8417beb75e51ed29 (diff)
downloadgit-0a8fcbdca28f6c8dad3cac9aca48f866c84b0f11.tar.gz
git-0a8fcbdca28f6c8dad3cac9aca48f866c84b0f11.tar.xz
t5551-http-fetch: Work around some libcurl versions
Some versions of libcurl report their output when GIT_CURL_VERBOSE is set differently than other versions do. At least one variant (version unknown but likely pre-7.18.1) reports the POST payload to stderr, and omits the blank line after each HTTP request/response. We clip these lines out of the stderr output now before doing the compare, so we aren't surprised by this trivial difference. Reported-by: Tarmigan <tarmigan+git@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5551-http-fetch.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh
index eb0c03932..0bf165bac 100755
--- a/t/t5551-http-fetch.sh
+++ b/t/t5551-http-fetch.sh
@@ -31,23 +31,19 @@ cat >exp <<EOF
> GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1
> Accept: */*
> Pragma: no-cache
-
< HTTP/1.1 200 OK
< Pragma: no-cache
< Cache-Control: no-cache, max-age=0, must-revalidate
< Content-Type: application/x-git-upload-pack-advertisement
-<
> POST /smart/repo.git/git-upload-pack HTTP/1.1
> Accept-Encoding: deflate, gzip
> Content-Type: application/x-git-upload-pack-request
> Accept: application/x-git-upload-pack-response
> Content-Length: xxx
-
< HTTP/1.1 200 OK
< Pragma: no-cache
< Cache-Control: no-cache, max-age=0, must-revalidate
< Content-Type: application/x-git-upload-pack-result
-<
EOF
test_expect_success 'clone http repository' '
GIT_CURL_VERBOSE=1 git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
@@ -56,6 +52,8 @@ test_expect_success 'clone http repository' '
sed -e "
s/Q\$//
/^[*] /d
+ /^$/d
+ /^< $/d
/^[^><]/{
s/^/> /
@@ -64,6 +62,8 @@ test_expect_success 'clone http repository' '
/^> User-Agent: /d
/^> Host: /d
s/^> Content-Length: .*/> Content-Length: xxx/
+ /^> 00..want /d
+ /^> 00.*done/d
/^< Server: /d
/^< Expires: /d