Usually there is no need for users to specify whether an http remote is smart or dumb; the protocol is designed so that a single initial request is made, and the client can determine the server's capability from the response. However, some misconfigured dumb-only servers may not like the initial request by a smart client, as it contains a query string. Until recently, commit 703e6e7 worked around this by making a second request. However, that commit was recently reverted due to its side effect of masking the initial request's error code. This patch takes a different approach to the workaround. We assume that the common case is that the server is either smart-http or a reasonably configured dumb-http. If that is not the case, we provide both a per-remote config option and an environment variable with which the user can manually work around the issue. Signed-off-by: Jeff King <peff@xxxxxxxx> --- I added the config item as remote.foo.smarthttp. You could also allow "http.$url.smart" (and just "http.smart", for that matter), which could be more flexible if you have multiple remotes pointing to the same broken server. However, it is also more complex to use, and is a lot more code. Since we don't know if any such servers even exist, I tried to give the minimal escape hatch, and we can easily build more features on it later if people complain. Documentation/config.txt | 11 +++++++++++ remote-curl.c | 3 ++- remote.c | 3 +++ remote.h | 1 + t/t5551-http-fetch.sh | 17 +++++++++++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 6416cae..651b23c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1871,6 +1871,17 @@ remote.<name>.uploadpack:: The default program to execute on the remote side when fetching. See option \--upload-pack of linkgit:git-fetch-pack[1]. +remote.<name>.smartHttp:: + If true, this remote will attempt to use git's smart http + protocol when making remote http requests. Normally git sends an + initial smart-http request, and falls back to the older "dumb" + protocol if the server does not claim to support the smart + protocol. However, some misconfigured dumb-only servers may + produce confusing results for the initial request. Setting this + option to false disables the initial smart request, which can + workaround problems with such servers. You should not generally + need to set this. Defaults to `true`. + remote.<name>.tagopt:: Setting this value to \--no-tags disables automatic tag following when fetching from remote <name>. Setting it to \--tags will fetch every diff --git a/remote-curl.c b/remote-curl.c index c0b98cc..8829bfb 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -102,7 +102,8 @@ static struct discovery* discover_refs(const char *service) free_discovery(last); strbuf_addf(&buffer, "%sinfo/refs", url); - if (!prefixcmp(url, "http://";) || !prefixcmp(url, "https://";)) { + if ((!prefixcmp(url, "http://";) || !prefixcmp(url, "https://";)) && + git_env_bool("GIT_SMART_HTTP", remote->smart_http)) { maybe_smart = 1; if (!strchr(url, '?')) strbuf_addch(&buffer, '?'); diff --git a/remote.c b/remote.c index 04fd9ea..a334390 100644 --- a/remote.c +++ b/remote.c @@ -152,6 +152,7 @@ static struct remote *make_remote(const char *name, int len) ret->name = xstrndup(name, len); else ret->name = xstrdup(name); + ret->smart_http = 1; return ret; } @@ -453,6 +454,8 @@ static int handle_config(const char *key, const char *value, void *cb) key, value); } else if (!strcmp(subkey, ".vcs")) { return git_config_string(&remote->foreign_vcs, key, value); + } else if (!strcmp(subkey, ".smarthttp")) { + remote->smart_http = git_config_bool(key, value); } return 0; } diff --git a/remote.h b/remote.h index 251d8fd..9031d18 100644 --- a/remote.h +++ b/remote.h @@ -40,6 +40,7 @@ struct remote { int fetch_tags; int skip_default_update; int mirror; + int smart_http; const char *receivepack; const char *uploadpack; diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index 2db5c35..48173ed 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -129,6 +129,23 @@ test_expect_success 'clone from auth-only-for-push repository' ' test_cmp expect actual ' +test_expect_success 'disable dumb http on server' ' + git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \ + config http.getanyfile false +' + +test_expect_success 'GIT_SMART_HTTP can disable smart http' ' + (GIT_SMART_HTTP=0 && + export GIT_SMART_HTTP && + cd clone && + test_must_fail git fetch) +' + +test_expect_success 'remote.*.smartHTTP can disable smart http' ' + (cd clone && + test_must_fail git -c remote.origin.smartHTTP=false fetch) +' + test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' -- 1.7.11.7.15.g085c6bd -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html