From: Tarmigan <tarmigan+git@gmail.com>
Date: Mon, 09 Nov 2009 18:36:33 GMT
Subject: Re: [PATCH 2/3] t5551-http-fetch: Work around some libcurl versions
Message-ID: <905315640911091036t21321a54u4a4c20d2b2034ad7@mail.gmail.com>
In-Reply-To: <1257790237-30850-2-git-send-email-spearce@spearce.org>

On Mon, Nov 9, 2009 at 10:10 AM, Shawn O. Pearce <spearce@spearce.org> wrote:
> 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.

Yes, my curl is 7.15.5.

> @@ -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

Almost.  This still needs a
'> '
before both of the 00 additions.  Changing this and applying 3/3 makes
the test pass for me.

Tested-with-modifications-by: Tarmigan <tarmigan+git@gmail.com>