Introduce http.$url_prefix.dumbhttpfallback configuration variables
so that users do not have to set GIT_DUMB_HTTP_FALLBACK environment
depending on which remote they are talking with.

Signed-off-by: Junio C Hamano <gits...@pobox.com>
---
 remote-curl.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/remote-curl.c b/remote-curl.c
index f25cf3c..44544c7 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -855,6 +855,46 @@ static void parse_push(struct strbuf *buf)
        free(specs);
 }
 
+struct dumb_fallback_cb {
+       const char *url;
+       int value;
+};
+
+static int dumb_fallback_cb(const char *key, const char *value, void *cb_)
+{
+       struct dumb_fallback_cb *cb = cb_;
+       int i, len;
+
+       /* Is this "http.$url.dumbHttpFallback"? */
+       if (prefixcmp(key, "http."))
+               return 0;
+       len = strrchr(key, '.') - key;
+       if (len <= 5)
+               /* we found the dot at the end of "http." */
+               return 0;
+       key += 5; /* skip over http. part */
+       len -= 5;
+       if (strcmp(key + len, ".dumbhttpfallback"))
+               return 0;
+
+       /* Does the $url part match? */
+       for (i = 0; i < len; i++)
+               if (cb->url[i] != key[i])
+                       return 0;
+       cb->value = git_config_bool(key, value);
+       return 0;
+}
+
+static int dumb_fallback_config(const char *url)
+{
+       struct dumb_fallback_cb cb;
+
+       cb.url = url;
+       cb.value = 1; /* defaults to true */
+       git_config(dumb_fallback_cb, &cb);
+       return cb.value;
+}
+
 static const char DUMB_HTTP_FALLBACK_ENV[] = "GIT_DUMB_HTTP_FALLBACK";
 
 int main(int argc, const char **argv)
@@ -872,12 +912,6 @@ 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]);
 
@@ -889,6 +923,13 @@ int main(int argc, const char **argv)
 
        url = strbuf_detach(&buf, NULL);
 
+       if (getenv(DUMB_HTTP_FALLBACK_ENV)) {
+               char *fb = getenv(DUMB_HTTP_FALLBACK_ENV);
+               options.fallback = git_config_bool(DUMB_HTTP_FALLBACK_ENV, fb);
+       } else {
+               options.fallback = dumb_fallback_config(url);
+       }
+
        http_init(remote, url, 0);
 
        do {
-- 
1.7.12.1.389.g3dff30b

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to