Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/remote-curl-squelch-extra-errors'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 21 Jul 2014 18:18:40 +0000
(11:18 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 21 Jul 2014 18:18:41 +0000
(11:18 -0700)
* 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
1
2
remote-curl.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
19a249b
cdaa4e9
)
diff --cc
remote-curl.c
index cdcca2903b100c775d4e004312086581f5839ad4,449c24defa1485d972467d55633b79107af5f6ae..0fcf2ce5ff20cc7c6f1bdf6257c94cf8fa21b35a
---
1
/
remote-curl.c
---
2
/
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)