Re: [PATCH 3/4] t5550-http-fetch-dumb.sh: use the GIT_TRACE_CURL environment var

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sep 5, 2016, 13:43 UTC
Message-ID: <CAPig+cTsCDpCQ9j82OEa13YBYswDKfYd_dc1QbxRSRk3wiOhHw@mail.gmail.com>
In-Reply-To: <20160905102444.3586-4-gitter.spiros@gmail.com>

On Mon, Sep 5, 2016 at 6:24 AM, Elia Pinto <gitter.spiros@gmail.com> wrote:

Show 25 quoted lines

> Use the new GIT_TRACE_CURL environment variable instead
> of the deprecated GIT_CURL_VERBOSE.
>
> Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
> ---
> diff --git a/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
> @@ -263,15 +263,18 @@ check_language () {
>                 >expect
>                 ;;
>         ?*)
> -               echo "Accept-Language: $1" >expect
> +               echo "=> Send header: Accept-Language: $1" >expect
>                 ;;
>         esac &&
> -       GIT_CURL_VERBOSE=1 \
> +       GIT_TRACE_CURL=true \
>         LANGUAGE=$2 \
>         git ls-remote "$HTTPD_URL/dumb/repo.git" >output 2>&1 &&
>         tr -d '\015' <output |
>         sort -u |
> -       sed -ne '/^Accept-Language:/ p' >actual &&
> +       sed -ne '/^=> Send header: Accept-Language:/ p' >actual &&
> +       cp expect expect.$$ &&
> +       cp actual actual.$$ &&
> +       cp output output.$$ &&

What are these three cp's about? They don't seem to be related to the stated changes. Are they leftover debugging gunk?

Show 14 quoted lines

>         test_cmp expect actual
>  }
>
> @@ -295,8 +298,8 @@ ja;q=0.95, zh;q=0.94, sv;q=0.93, pt;q=0.92, nb;q=0.91, *;q=0.90" \
>  '
>
>  test_expect_success 'git client does not send an empty Accept-Language' '
> -       GIT_CURL_VERBOSE=1 LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
> -       ! grep "^Accept-Language:" stderr
> +       GIT_TRACE_CURL=true LANGUAGE= git ls-remote "$HTTPD_URL/dumb/repo.git" 2>stderr &&
> +       ! grep "^=> Send header: Accept-Language:" stderr
>  '
>
>  stop_httpd