From: Jakub Narebski <jnareb@gmail.com>
To: Tay Ray Chuan <rctay89@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Mike Hommey <mh@glandium.org>
Subject: Re: [PATCH 17/23] http.c::http_fetch_ref(): use the new http API
Date: Fri, 05 Jun 2009 13:50:58 -0700 (PDT) [thread overview]
Message-ID: <m3eity5rtq.fsf@localhost.localdomain> (raw)
In-Reply-To: <20090606000556.9cbf4ac0.rctay89@gmail.com>
Tay Ray Chuan <rctay89@gmail.com> writes:
> From: Mike Hommey <mh@glandium.org>
> Subject: [WIP Patch 04/12] Use the new http API in http_fetch_ref()
What is the subject of this patch:
"http.c::http_fetch_ref(): use the new http API"
or
"Use the new http API in http_fetch_ref()"
Perhaps this and previous patch should be squashed?
> Date: Sun, 18 Jan 2009 09:04:29 +0100
>
> The error message ("Unable to start request") has been removed, since
> the http API already prints it.
>
> Signed-off-by: Mike Hommey <mh@glandium.org>
> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
> ---
> http.c | 33 ++++++++-------------------------
> 1 files changed, 8 insertions(+), 25 deletions(-)
>
> diff --git a/http.c b/http.c
> index df22180..2a49372 100644
> --- a/http.c
> +++ b/http.c
> @@ -773,34 +773,17 @@ int http_fetch_ref(const char *base, struct ref *ref)
> {
> char *url;
> struct strbuf buffer = STRBUF_INIT;
> - struct active_request_slot *slot;
> - struct slot_results results;
> - int ret;
> + int ret = -1;
>
> url = quote_ref_url(base, ref->name);
> - slot = get_active_slot();
> - slot->results = &results;
> - curl_easy_setopt(slot->curl, CURLOPT_FILE, &buffer);
> - curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, fwrite_buffer);
> - curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, NULL);
> - curl_easy_setopt(slot->curl, CURLOPT_URL, url);
> - if (start_active_slot(slot)) {
> - run_active_slot(slot);
> - if (results.curl_result == CURLE_OK) {
> - strbuf_rtrim(&buffer);
> - if (buffer.len == 40)
> - ret = get_sha1_hex(buffer.buf, ref->old_sha1);
> - else if (!prefixcmp(buffer.buf, "ref: ")) {
> - ref->symref = xstrdup(buffer.buf + 5);
> - ret = 0;
> - } else
> - ret = 1;
> - } else {
> - ret = error("Couldn't get %s for %s\n%s",
> - url, ref->name, curl_errorstr);
> + if (http_get_strbuf(url, &buffer, HTTP_NO_CACHE) == HTTP_OK) {
> + strbuf_rtrim(&buffer);
> + if (buffer.len == 40)
> + ret = get_sha1_hex(buffer.buf, ref->old_sha1);
> + else if (!prefixcmp(buffer.buf, "ref: ")) {
> + ref->symref = xstrdup(buffer.buf + 5);
> + ret = 0;
> }
> - } else {
> - ret = error("Unable to start request");
> }
>
> strbuf_release(&buffer);
> --
> 1.6.3.1
>
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2009-06-05 20:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-05 16:05 [PATCH 17/23] http.c::http_fetch_ref(): use the new http API Tay Ray Chuan
2009-06-05 20:50 ` Jakub Narebski [this message]
2009-06-06 1:04 ` Tay Ray Chuan
2009-06-06 7:17 ` Jakub Narebski
[not found] <cover.1244277116.git.rctay89@gmail.com>
2009-06-06 8:43 ` Tay Ray Chuan
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=m3eity5rtq.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mh@glandium.org \
--cc=rctay89@gmail.com \
/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).