From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Mar 2009 05:34:43 +0000 (-0700)
Subject: http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL
X-Git-Tag: v1.6.3-rc0~81^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=750d9305009a0f3fd14c0b5c5e62ae1eb2b18fda;p=git.git

http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient versions of cURL

Besides, we have already called easy_setopt with the option before coming
to this function if it was available, so there is no need to repeat it
here.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/http.c b/http.c
index b8f947e40..2fc55d671 100644
--- a/http.c
+++ b/http.c
@@ -138,9 +138,7 @@ static int http_options(const char *var, const char *value, void *cb)
 
 static void init_curl_http_auth(CURL *result)
 {
-	if (!user_name)
-		curl_easy_setopt(result, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
-	else {
+	if (user_name) {
 		struct strbuf up = STRBUF_INIT;
 		if (!user_pass)
 			user_pass = xstrdup(getpass("Password: "));