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 b8f947e405fa95cdd422e67637b4f816354cf808..2fc55d671e2e8c5302eaf140f5ecff0b1d701cef 100644 (file)
--- 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)
 {
 
 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: "));
                struct strbuf up = STRBUF_INIT;
                if (!user_pass)
                        user_pass = xstrdup(getpass("Password: "));