summaryrefslogtreecommitdiff
path: root/remote-curl.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-09-20 17:00:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-20 17:48:45 (GMT)
commit243c329c1ed8036c6e1b65d3921cb1a3a24e6385 (patch)
treea3605f38b277f794bbb8d746a7c89a87b4d6043c /remote-curl.c
parent6ac964a627e02ac73d4c97c492acf604942030e9 (diff)
downloadgit-243c329c1ed8036c6e1b65d3921cb1a3a24e6385.zip
git-243c329c1ed8036c6e1b65d3921cb1a3a24e6385.tar.gz
git-243c329c1ed8036c6e1b65d3921cb1a3a24e6385.tar.bz2
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>
Diffstat (limited to 'remote-curl.c')
-rw-r--r--remote-curl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/remote-curl.c b/remote-curl.c
index 2359f59..c0b98cc 100644
--- 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;
- int http_ret, is_http = 0;
+ int http_ret, maybe_smart = 0;
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://")) {
- is_http = 1;
+ maybe_smart = 1;
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;
- 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.
*/