From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Sat, 16 Jul 2011 13:03:29 +0000 (+0200)
Subject: remote-curl: accept empty line as terminator
X-Git-Tag: v1.7.7-rc0~61^2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1843f0ce4d31e3c37f7d07dd1d13f6fb034ac2b0;p=git.git

remote-curl: accept empty line as terminator

This went unnoticed because the transport helper infrastructore did
not check the return value of the helper, nor did the helper print
anything before exiting.

While at it also make sure that the stream doesn't end unexpectedly.

Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/remote-curl.c b/remote-curl.c
index 17d8a9b37..7b3c113b0 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -855,7 +855,14 @@ int main(int argc, const char **argv)
 	http_init(remote);
 
 	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)
@@ -895,6 +902,7 @@ int main(int argc, const char **argv)
 			printf("\n");
 			fflush(stdout);
 		} else {
+			fprintf(stderr, "Unknown command '%s'\n", buf.buf);
 			return 1;
 		}
 		strbuf_reset(&buf);