remote-curl: rename is_http variable

We don't actually care whether the connection is http or
not; what we care about is whether it might be smart http.
Rename the variable to be more accurate, which will make it
easier to later make smart-http optional.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/remote-curl.c b/remote-curl.c
index 2359f59202ac63566caa893a85a1356dbd8d5526..c0b98ccdf74d8812d993a39000bdb6e3741af6e1 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -95,7 +95,7 @@ static struct discovery* discover_refs(const char *service)
        struct strbuf buffer = STRBUF_INIT;
        struct discovery *last = last_discovery;
        char *refs_url;
        struct strbuf buffer = STRBUF_INIT;
        struct discovery *last = last_discovery;
        char *refs_url;

-       int http_ret, is_http = 0;
+       int http_ret, maybe_smart = 0;

 
        if (last && !strcmp(service, last->service))
                return last;
 
        if (last && !strcmp(service, last->service))
                return last;


@@ -103,7 +103,7 @@ static struct discovery* discover_refs(const char *service)
 
        strbuf_addf(&buffer, "%sinfo/refs", url);
        if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {
 
        strbuf_addf(&buffer, "%sinfo/refs", url);
        if (!prefixcmp(url, "http://") || !prefixcmp(url, "https://")) {

-               is_http = 1;
+               maybe_smart = 1;

                if (!strchr(url, '?'))
                        strbuf_addch(&buffer, '?');
                else
                if (!strchr(url, '?'))
                        strbuf_addch(&buffer, '?');
                else


@@ -131,7 +131,7 @@ static struct discovery* discover_refs(const char *service)
        last->buf_alloc = strbuf_detach(&buffer, &last->len);
        last->buf = last->buf_alloc;
 
        last->buf_alloc = strbuf_detach(&buffer, &last->len);
        last->buf = last->buf_alloc;
 

-       if (is_http && 5 <= last->len && last->buf[4] == '#') {
+       if (maybe_smart && 5 <= last->len && last->buf[4] == '#') {

                /* smart HTTP response; validate that the service
                 * pkt-line matches our request.
                 */
                /* smart HTTP response; validate that the service
                 * pkt-line matches our request.
                 */