I was going to try and clean this up this weekend or early next week. I'm also trying to encourage open source submissions at work and was using this as an example patch to get people going (we need the fix to use git). So I do plan finishing this, just have to do it when I have time. Daniel, thanks for the link, I had been wondering what was introduced when in curl. -Mike Junio C Hamano wrote: > Mike Ralphson <mike.ralphson@xxxxxxxxx> writes: > >> Elsewhere we seem to protect use of CURL_NETRC_OPTIONAL by checking >> for LIBCURL_VERSION_NUM >= 0x070907. I have an ancient curl here >> (curl-7.9.3-2ssl) which doesn't seem to have this option, so building >> next is broken on AIX for me from this morning (c33976cb). > > Yeah, I did this as "How about doing it this way without adding a band-aid > configuration options" demonstration, and meant to clean it up (rather, > meant to wait for the original submitter to clean-up) before moving it > forward, but I forgot. Sorry about that. > > How does this look? > > http://curl.haxx.se/libcurl/c/curl_easy_setopt.html seems to say "added in > 7.X.Y" for some options but does say when CURLOPT_USERPWD was added, so I > am assuming it was available even in very early versions... > > -- >8 -- > From 750d9305009a0f3fd14c0b5c5e62ae1eb2b18fda Mon Sep 17 00:00:00 2001 > From: Junio C Hamano <gitster@xxxxxxxxx> > Date: Thu, 12 Mar 2009 22:34:43 -0700 > Subject: [PATCH] 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@xxxxxxxxx> > --- > http.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/http.c b/http.c > index b8f947e..2fc55d6 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: ")); -- -Mike Gaffney (http://rdocul.us) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
