From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 10/14] remote-curl: try base $URL after $URL/info/refs
Date: Thu, 10 Nov 2011 02:51:18 -0500 [thread overview]
Message-ID: <20111110075118.GJ27950@sigill.intra.peff.net> (raw)
In-Reply-To: <20111110074330.GA27925@sigill.intra.peff.net>
When fetching via http, we will try "$URL/info/refs" to get
the list of refs. We may get an unexpected bundle from that
transfer, and we already handle that case. But we should
also check just "$URL" to see if it's a bundle.
Signed-off-by: Jeff King <peff@peff.net>
---
And now we can actually test with apache.
remote-curl.c | 19 +++++++++++++++++++
t/t5552-http-bundle.sh | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+), 0 deletions(-)
create mode 100755 t/t5552-http-bundle.sh
diff --git a/remote-curl.c b/remote-curl.c
index 84586e0..7734495 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -222,6 +222,25 @@ static int get_refs_from_url(const char *url, struct strbuf *out, int options,
filename, &is_bundle);
}
+ /* try the straight URL for a bundle, but don't impact the
+ * error reporting that happens below. */
+ if (http_ret != HTTP_OK && http_ret != HTTP_NOAUTH) {
+ struct strbuf trimmed = STRBUF_INIT;
+ int r;
+
+ strbuf_reset(&buffer);
+
+ strbuf_addstr(&trimmed, url);
+ while (trimmed.len > 0 && trimmed.buf[trimmed.len-1] == '/')
+ strbuf_setlen(&trimmed, trimmed.len - 1);
+
+ r = get_refs_from_url(trimmed.buf, &buffer, 0, filename,
+ &is_bundle);
+ if (r == HTTP_OK && is_bundle)
+ http_ret = r;
+ strbuf_release(&trimmed);
+ }
+
switch (http_ret) {
case HTTP_OK:
break;
diff --git a/t/t5552-http-bundle.sh b/t/t5552-http-bundle.sh
new file mode 100755
index 0000000..8527403
--- /dev/null
+++ b/t/t5552-http-bundle.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='test fetching from http-accessible bundles'
+. ./test-lib.sh
+
+LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5552'}
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+test_expect_success 'create bundles' '
+ test_commit one &&
+ git bundle create "$HTTPD_DOCUMENT_ROOT_PATH/one.bundle" --all &&
+ test_commit two &&
+ git bundle create "$HTTPD_DOCUMENT_ROOT_PATH/two.bundle" --all ^one
+'
+
+test_expect_success 'clone from bundle' '
+ git clone --bare $HTTPD_URL/one.bundle clone &&
+ echo one >expect &&
+ git --git-dir=clone log -1 --format=%s >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'fetch from bundle' '
+ git --git-dir=clone fetch $HTTPD_URL/two.bundle refs/*:refs/* &&
+ echo two >expect &&
+ git --git-dir=clone log -1 --format=%s >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'cannot clone from partial bundle' '
+ test_must_fail git clone $HTTPD_URL/two.bundle
+'
+
+stop_httpd
+test_done
--
1.7.7.2.7.g9f96f
next prev parent reply other threads:[~2011-11-10 7:51 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-10 7:43 [PATCH 0/14] resumable network bundles Jeff King
2011-11-10 7:45 ` Jeff King
2011-11-10 7:46 ` [PATCH 01/14] t/lib-httpd: check for NO_CURL Jeff King
2011-11-10 7:48 ` [PATCH 02/14] http: turn off curl signals Jeff King
2011-11-10 8:43 ` Daniel Stenberg
2011-11-11 20:54 ` Jeff King
2011-11-10 7:48 ` [PATCH 03/14] http: refactor http_request function Jeff King
2011-11-10 7:49 ` [PATCH 04/14] http: add a public function for arbitrary-callback request Jeff King
2011-11-10 7:49 ` [PATCH 05/14] remote-curl: use http callback for requesting refs Jeff King
2011-11-10 7:49 ` [PATCH 06/14] transport: factor out bundle to ref list conversion Jeff King
2011-11-10 7:50 ` [PATCH 07/14] bundle: add is_bundle_buf helper Jeff King
2011-11-10 7:50 ` [PATCH 08/14] remote-curl: free "discovery" object Jeff King
2011-11-10 7:50 ` [PATCH 09/14] remote-curl: auto-detect bundles when fetching refs Jeff King
2011-11-10 7:51 ` Jeff King [this message]
2011-11-10 7:53 ` [PATCH 11/14] progress: allow pure-throughput progress meters Jeff King
2011-11-10 7:53 ` [PATCH 12/14] remote-curl: show progress for bundle downloads Jeff King
2011-11-10 7:53 ` [PATCH 13/14] remote-curl: resume interrupted bundle transfers Jeff King
2011-11-10 7:56 ` [PATCH 14/14] clone: give advice on how to resume a failed clone Jeff King
2011-11-10 21:21 ` Junio C Hamano
2011-11-11 20:52 ` Jeff King
2011-11-11 13:13 ` [PATCH 0/14] resumable network bundles David Michael Barr
2011-11-12 16:11 ` Tay Ray Chuan
2011-11-12 17:58 ` Jeff King
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=20111110075118.GJ27950@sigill.intra.peff.net \
--to=peff@peff.net \
--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).