diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-02 13:41:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-02 13:41:38 -0700 |
| commit | 8a477ddf237978d3f5725b24e286616000ca2ffd (patch) | |
| tree | c4d77d4bebcfadc5e6c645b1c06784586b8ae579 | |
| parent | a9073097b984a2a1db4f3b0df86cfaf624dfef21 (diff) | |
| parent | 6ac964a627e02ac73d4c97c492acf604942030e9 (diff) | |
| download | git-8a477ddf237978d3f5725b24e286616000ca2ffd.tar.gz git-8a477ddf237978d3f5725b24e286616000ca2ffd.tar.xz | |
Merge branch 'sp/maint-http-info-refs-no-retry' into maint
"git fetch" over http had an old workaround for an unlikely server
misconfiguration; it turns out that this hurts debuggability of the
configuration in general, and has been reverted.
* sp/maint-http-info-refs-no-retry:
Revert "retry request without query when info/refs?query fails"
| -rw-r--r-- | remote-curl.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/remote-curl.c b/remote-curl.c index 3ec474fc6..2359f5920 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, proto_git_candidate = 1; + int http_ret, is_http = 0; if (last && !strcmp(service, last->service)) return last; @@ -113,19 +113,6 @@ static struct discovery* discover_refs(const char *service) refs_url = strbuf_detach(&buffer, NULL); http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); - - /* try again with "plain" url (no ? or & appended) */ - if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) { - free(refs_url); - strbuf_reset(&buffer); - - proto_git_candidate = 0; - strbuf_addf(&buffer, "%sinfo/refs", url); - refs_url = strbuf_detach(&buffer, NULL); - - http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); - } - switch (http_ret) { case HTTP_OK: break; @@ -144,8 +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 && proto_git_candidate - && 5 <= last->len && last->buf[4] == '#') { + if (is_http && 5 <= last->len && last->buf[4] == '#') { /* smart HTTP response; validate that the service * pkt-line matches our request. */ |