From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 2/2] remote-curl: make dumb-http fallback configurable per URL
Date: Wed, 19 Sep 2012 21:14:59 -0700 [thread overview]
Message-ID: <1348114499-22811-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1348114499-22811-1-git-send-email-gitster@pobox.com>
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 <gitster@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
prev parent reply other threads:[~2012-09-20 4:15 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-20 2:55 [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0 Shawn O. Pearce
2012-09-20 3:22 ` Shawn Pearce
2012-09-20 3:52 ` Jeff King
2012-09-20 3:48 ` Jeff King
2012-09-20 5:57 ` Shawn Pearce
2012-09-20 5:58 ` [PATCH] Revert "retry request without query when info/refs?query fails" Shawn O. Pearce
2012-09-20 6:29 ` Junio C Hamano
2012-09-20 6:31 ` Junio C Hamano
2012-09-20 16:24 ` Jeff King
2012-09-20 16:59 ` [PATCH 0/2] smart http toggle switch fails" Jeff King
2012-09-20 17:00 ` [PATCH 1/2] remote-curl: rename is_http variable Jeff King
2012-09-20 17:05 ` [PATCH 2/2] remote-curl: let users turn off smart http Jeff King
2012-09-20 17:53 ` Junio C Hamano
2012-09-20 18:12 ` Jeff King
2012-09-20 18:36 ` Junio C Hamano
2012-09-20 20:51 ` Jeff King
2012-09-20 21:15 ` Junio C Hamano
2012-09-20 21:30 ` Jeff King
2012-09-21 17:34 ` Junio C Hamano
2012-09-21 17:41 ` Jeff King
2012-09-20 17:24 ` [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0 Jeff King
2012-09-20 23:05 ` Shawn Pearce
2012-09-21 5:26 ` Jeff King
2012-09-21 14:19 ` Shawn Pearce
2012-10-01 21:23 ` [PATCH] Retry HTTP requests on SSL connect failures Shawn O. Pearce
2012-10-01 21:47 ` Junio C Hamano
2012-10-01 21:53 ` Junio C Hamano
2012-10-01 22:23 ` Jeff King
2012-10-01 23:20 ` Junio C Hamano
2012-10-01 22:18 ` Jeff King
2012-10-02 2:38 ` Shawn Pearce
2012-10-02 13:57 ` Drew Northup
2012-10-02 0:14 ` Drew Northup
2012-09-20 4:14 ` Re* [PATCH] Disable dumb HTTP fallback with GIT_CURL_FALLBACK=0 Junio C Hamano
2012-09-20 4:14 ` [PATCH 1/2] Disable dumb HTTP fallback with GIT_DUMB_HTTP_FALLBACK=false Junio C Hamano
2012-09-20 4:14 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348114499-22811-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).