From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Oct 2011 04:37:15 +0000 (-0700)
Subject: Merge branch 'jk/http-auth'
X-Git-Tag: v1.7.8-rc0~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=963838402a94e7fcbd1a73019f80aff708972af8;p=git.git

Merge branch 'jk/http-auth'

* jk/http-auth:
  http_init: accept separate URL parameter
  http: use hostname in credential description
  http: retry authentication failures for all http requests
  remote-curl: don't retry auth failures with dumb protocol
  improve httpd auth tests
  url: decode buffers that are not NUL-terminated
---

963838402a94e7fcbd1a73019f80aff708972af8
diff --cc remote-curl.c
index 0aa4bfed3,d4d0910e6..0e720ee8b
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -859,17 -850,10 +859,17 @@@ int main(int argc, const char **argv
  
  	url = strbuf_detach(&buf, NULL);
  
- 	http_init(remote);
+ 	http_init(remote, url);
  
  	do {
 -		if (strbuf_getline(&buf, stdin, '\n') == EOF)
 +		if (strbuf_getline(&buf, stdin, '\n') == EOF) {
 +			if (ferror(stdin))
 +				fprintf(stderr, "Error reading command stream\n");
 +			else
 +				fprintf(stderr, "Unexpected end of command stream\n");
 +			return 1;
 +		}
 +		if (buf.len == 0)
  			break;
  		if (!prefixcmp(buf.buf, "fetch ")) {
  			if (nongit)