http-push.c::fetch_symref(): use the new http API

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-push.c b/http-push.c
index c5642b5d4d3dd0565a7a2b08f0f76d6bf30021a7..34905214755856c1671324c2b47e263775e27b8d 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -2028,27 +2028,13 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
 {
        char *url;
        struct strbuf buffer = STRBUF_INIT;
 {
        char *url;
        struct strbuf buffer = STRBUF_INIT;

-       struct active_request_slot *slot;
-       struct slot_results results;

 
        url = xmalloc(strlen(repo->url) + strlen(path) + 1);
        sprintf(url, "%s%s", repo->url, path);
 
 
        url = xmalloc(strlen(repo->url) + strlen(path) + 1);
        sprintf(url, "%s%s", repo->url, path);
 

-       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) {
-                       die("Couldn't get %s for remote symref\n%s",
-                           url, curl_errorstr);
-               }
-       } else {
-               die("Unable to start remote symref request");
-       }
+       if (http_get_strbuf(url, &buffer, 0) != HTTP_OK)
+               die("Couldn't get %s for remote symref\n%s", url,
+                   curl_errorstr);

        free(url);
 
        free(*symref);
        free(url);
 
        free(*symref);