mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2014-07-21 11:18:40 -07:00
parent 19a249ba83 cdaa4e98ca
commit 0ac744305f
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
remote-curl.c
View File

@ -399,7 +399,7 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
rpc->pos = 0; rpc->pos = 0;
return CURLIOE_OK; return CURLIOE_OK;
} }
fprintf(stderr, "Unable to rewind rpc post data - try increasing http.postBuffer\n"); error("unable to rewind rpc post data - try increasing http.postBuffer");
return CURLIOE_FAILRESTART; return CURLIOE_FAILRESTART;
default: default:
@ -709,7 +709,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
free(targets[i]); free(targets[i]);
free(targets); free(targets);
return ret ? error("Fetch failed.") : 0; return ret ? error("fetch failed.") : 0;
} }
static int fetch_git(struct discovery *heads, static int fetch_git(struct discovery *heads,
@ -949,7 +949,7 @@ int main(int argc, const char **argv)
git_extract_argv0_path(argv[0]); git_extract_argv0_path(argv[0]);
setup_git_directory_gently(&nongit); setup_git_directory_gently(&nongit);
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Remote needed\n"); error("remote-curl: usage: git remote-curl <remote> [<url>]");
return 1; return 1;
} }
@ -972,16 +972,14 @@ int main(int argc, const char **argv)
if (strbuf_getline(&buf, stdin, '\n') == EOF) { if (strbuf_getline(&buf, stdin, '\n') == EOF) {
if (ferror(stdin)) if (ferror(stdin))
fprintf(stderr, "Error reading command stream\n"); error("remote-curl: error reading command stream from git");
else
fprintf(stderr, "Unexpected end of command stream\n");
return 1; return 1;
} }
if (buf.len == 0) if (buf.len == 0)
break; break;
if (starts_with(buf.buf, "fetch ")) { if (starts_with(buf.buf, "fetch ")) {
if (nongit) if (nongit)
die("Fetch attempted without a local repo"); die("remote-curl: fetch attempted without a local repo");
parse_fetch(&buf); parse_fetch(&buf);
} else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) { } else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) {
@ -1017,7 +1015,7 @@ int main(int argc, const char **argv)
printf("\n"); printf("\n");
fflush(stdout); fflush(stdout);
} else { } else {
fprintf(stderr, "Unknown command '%s'\n", buf.buf); error("remote-curl: unknown command '%s' from git", buf.buf);
return 1; return 1;
} }
strbuf_reset(&buf); strbuf_reset(&buf);