Skip to content

Commit

Permalink
remote-curl: mark helper-protocol errors more clearly
Browse files Browse the repository at this point in the history
When we encounter an error in remote-curl, we generally just
report it to stderr. There is no need for the user to care
that the "could not connect to server" error was generated
by git-remote-https rather than a function in the parent
git-fetch process.

However, when the error is in the protocol between git and
the helper, it makes sense to clearly identify which side is
complaining. These cases shouldn't ever happen, but when
they do, we can make them less confusing by being more
verbose.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jul 10, 2014
1 parent b725b27 commit cdaa4e9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions remote-curl.c
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ int main(int argc, const char **argv)
git_extract_argv0_path(argv[0]);
setup_git_directory_gently(&nongit);
if (argc < 2) {
error("remote needed");
error("remote-curl: usage: git remote-curl <remote> [<url>]");
return 1;
}

Expand All @@ -970,14 +970,14 @@ int main(int argc, const char **argv)
do {
if (strbuf_getline(&buf, stdin, '\n') == EOF) {
if (ferror(stdin))
error("error reading command stream");
error("remote-curl: error reading command stream from git");
return 1;
}
if (buf.len == 0)
break;
if (starts_with(buf.buf, "fetch ")) {
if (nongit)
die("Fetch attempted without a local repo");
die("remote-curl: fetch attempted without a local repo");
parse_fetch(&buf);

} else if (!strcmp(buf.buf, "list") || starts_with(buf.buf, "list ")) {
Expand Down Expand Up @@ -1014,7 +1014,7 @@ int main(int argc, const char **argv)
printf("\n");
fflush(stdout);
} else {
error("unknown command '%s'", buf.buf);
error("remote-curl: unknown command '%s' from git", buf.buf);
return 1;
}
strbuf_reset(&buf);
Expand Down

0 comments on commit cdaa4e9

Please sign in to comment.