From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jul 2014 18:18:40 +0000 (-0700)
Subject: Merge branch 'jk/remote-curl-squelch-extra-errors'
X-Git-Tag: v2.1.0-rc0~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ac744305f5885207bf96fc5488fcc59782ffa96;p=git

Merge branch 'jk/remote-curl-squelch-extra-errors'

* jk/remote-curl-squelch-extra-errors:
  remote-curl: mark helper-protocol errors more clearly
  remote-curl: use error instead of fprintf(stderr)
  remote-curl: do not complain on EOF from parent git
---

0ac744305f5885207bf96fc5488fcc59782ffa96
diff --cc remote-curl.c
index cdcca2903b,449c24defa..0fcf2ce5ff
--- a/remote-curl.c
+++ b/remote-curl.c
@@@ -968,13 -968,9 +968,11 @@@ int main(int argc, const char **argv
  	http_init(remote, url.buf, 0);
  
  	do {
 +		const char *arg;
 +
  		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");
+ 				error("remote-curl: error reading command stream from git");
  			return 1;
  		}
  		if (buf.len == 0)