diff options
| author |  Mike Hommey <mh@glandium.org> | 2009-06-06 16:43:58 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-06 11:03:11 -0700 |
| commit | 9af5abd9939585bb588d537085138563922c6abe (patch) | |
| tree | da01c68b7cc20592375641c063e2cee7866f39b1 | |
| parent | http-push.c::remote_exists(): use the new http API (diff) | |
| download | tgif-9af5abd9939585bb588d537085138563922c6abe.tar.xz | |
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>
| -rw-r--r-- | http-push.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/http-push.c b/http-push.c index c5642b5d4d..3490521475 100644 --- 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; - struct active_request_slot *slot; - struct slot_results results; 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); |