X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=http-pull.c;h=b2cecaea396625b41f12604944d9364383650f0a;hb=71fb3de0eed70bba1c7e28c8a0a2968efc48b9f3;hp=ec53dad8efbe6e7734b75eaba8821ac290a5abbb;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git

diff --git a/http-pull.c b/http-pull.c
index ec53dad8..b2cecaea 100644
--- a/http-pull.c
+++ b/http-pull.c
@@ -16,6 +16,8 @@ static z_stream stream;
 static int local;
 static int zret;
 
+static int curl_ssl_verify;
+
 struct buffer
 {
         size_t posn;
@@ -150,10 +152,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 +175,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))