[PATCH 1/2] Disable dumb HTTP fallback with GIT_DUMB_HTTP_FALLBACK=false
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 20, 2012, 04:14 UTC
- Message-ID
- <1348114499-22811-2-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1348114499-22811-1-git-send-email-gitster@pobox.com>
From: "Shawn O. Pearce" <spearce@spearce.org>
If the user doesn't want to use the dumb HTTP protocol, she may set GIT_DUMB_HTTP_FALLBACK=false in the environment before invoking a Git protocol operation. This is mostly useful when testing against servers that are known to not support the dumb protocol. If the smart service detection fails the client should not continue with dumb behavior, but instead provide accurate HTTP failure data.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- remote-curl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c index 3ec474f..f25cf3c 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -17,7 +17,8 @@ struct options { unsigned progress : 1, followtags : 1, dry_run : 1, - thin : 1; + thin : 1, + fallback : 1; }; static struct options options; @@ -115,7 +116,8 @@ static struct discovery* discover_refs(const char *service) 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) { + if (options.fallback && http_ret != HTTP_OK + && http_ret != HTTP_NOAUTH) { free(refs_url); strbuf_reset(&buffer); @@ -853,6 +855,8 @@ static void parse_push(struct strbuf *buf) free(specs); } +static const char DUMB_HTTP_FALLBACK_ENV[] = "GIT_DUMB_HTTP_FALLBACK"; + int main(int argc, const char **argv) { struct strbuf buf = STRBUF_INIT; @@ -868,6 +872,12 @@ int main(int argc, const char **argv) options.verbosity = 1; options.progress = !!isatty(2); options.thin = 1; + options.fallback = 1; + + if (getenv(DUMB_HTTP_FALLBACK_ENV)) { + char *fb = getenv(DUMB_HTTP_FALLBACK_ENV); + options.fallback = git_config_bool(DUMB_HTTP_FALLBACK_ENV, fb); + } remote = remote_get(argv[1]);
-- 1.7.12.1.389.g3dff30b