http.c::http_fetch_ref(): use the new http API

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http.c b/http.c
index df22180778c2eca8be9f14029e2ca380a6de71f1..2a493720126009fad0eba12fcadbae7264d5b72b 100644 (file)
--- 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);