summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-22 10:29:07 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-22 10:29:07 -0700
commitcd989a97ec5bdb612693fbbed98b7adeb52a83a0 (patch)
treeb823c92a4afa80790f3e1cfbb999ebe8cf3ccc9b
parent0d854fc1e35c145f81d97c4565bd6c07a7d47f19 (diff)
parent479eaa8ef8384d8026dc05c1288e96ffd9e296d6 (diff)
downloadgit-cd989a97ec5bdb612693fbbed98b7adeb52a83a0.tar.gz
Merge branch 'ah/fix-http-push' into maint
* ah/fix-http-push: http-push.c: make CURLOPT_IOCTLDATA a usable pointer
-rw-r--r--http-push.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http-push.c b/http-push.c
index de00d1693a..bc94a3f6ab 100644
--- a/http-push.c
+++ b/http-push.c
@@ -199,7 +199,7 @@ static void curl_setup_http(CURL *curl, const char *url,
curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer);
#ifndef NO_CURL_IOCTL
curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer);
- curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer);
+ curl_easy_setopt(curl, CURLOPT_IOCTLDATA, buffer);
#endif
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn);
curl_easy_setopt(curl, CURLOPT_NOBODY, 0);