[PATCH] Trivial tidyups

[git.git] / http-pull.c

diff --git a/http-pull.c b/http-pull.c
index ec53dad..da4d65a 100644 (file)
--- a/http-pull.c
+++ b/http-pull.c
@@ -6,6 +6,16 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
+#if LIBCURL_VERSION_NUM < 0x070704
+#define curl_global_cleanup() do { /* nothing */ } while(0)
+#endif
+#if LIBCURL_VERSION_NUM < 0x070800
+#define curl_global_init(a) do { /* nothing */ } while(0)
+#endif
+#if LIBCURL_VERSION_NUM < 0x070907
+#define curl_easy_setopt(a, b, c) do { /* nothing */ } while(0)
+#endif
+
 static CURL *curl;
 
 static char *base;
@@ -16,6 +26,8 @@ static z_stream stream;
 static int local;
 static int zret;
 
+static int curl_ssl_verify;
+
 struct buffer
 {
         size_t posn;
@@ -150,10 +162,6 @@ int main(int argc, char **argv)
                        get_tree = 1;
                } else if (argv[arg][1] == 'c') {
                        get_history = 1;
-               } else if (argv[arg][1] == 'd') {
-                       get_delta = 0;
-               } else if (!strcmp(argv[arg], "--recover")) {
-                       get_delta = 2;
                } else if (argv[arg][1] == 'a') {
                        get_all = 1;
                        get_tree = 1;
@@ -177,6 +185,10 @@ int main(int argc, char **argv)
 
        curl = curl_easy_init();
 
+       curl_ssl_verify = gitenv("GIT_SSL_NO_VERIFY") ? 0 : 1;
+       curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, curl_ssl_verify);
+       curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
+
        base = url;
 
        if (pull(commit_id))