diff options
| author | Ilari Liusvaara <ilari.liusvaara@elisanet.fi> | 2010-01-12 19:53:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 21:10:38 (GMT) |
| commit | 6b02de3b9dc4ac8374cea4964e993ec6636d781c (patch) | |
| tree | 93d94fca86cc13795a32a95b69a7ac9c9057c1e4 /transport-helper.c | |
| parent | 2b541bf8be2bbd6cc8daf8e3d5d4a8ee30b2ce4e (diff) | |
| download | git-6b02de3b9dc4ac8374cea4964e993ec6636d781c.zip git-6b02de3b9dc4ac8374cea4964e993ec6636d781c.tar.gz git-6b02de3b9dc4ac8374cea4964e993ec6636d781c.tar.bz2 | |
Improve error message when a transport helper was not found
Perviously, the error message was:
git: 'remote-foo' is not a git-command. See 'git --help'.
By not treating the transport helper as a git command, a more suitable
error is reported:
fatal: Unable to find remote helper for 'foo'
Signed-off-by: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport-helper.c')
| -rw-r--r-- | transport-helper.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/transport-helper.c b/transport-helper.c index 6ece0d9..7dce4a4 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -102,6 +102,7 @@ static struct child_process *get_helper(struct transport *transport) int refspec_nr = 0; int refspec_alloc = 0; int duped; + int code; if (data->helper) return data->helper; @@ -111,13 +112,18 @@ static struct child_process *get_helper(struct transport *transport) helper->out = -1; helper->err = 0; helper->argv = xcalloc(4, sizeof(*helper->argv)); - strbuf_addf(&buf, "remote-%s", data->name); + strbuf_addf(&buf, "git-remote-%s", data->name); helper->argv[0] = strbuf_detach(&buf, NULL); helper->argv[1] = transport->remote->name; helper->argv[2] = remove_ext_force(transport->url); - helper->git_cmd = 1; - if (start_command(helper)) - die("Unable to run helper: git %s", helper->argv[0]); + helper->git_cmd = 0; + helper->silent_exec_failure = 1; + code = start_command(helper); + if (code < 0 && errno == ENOENT) + die("Unable to find remote helper for '%s'", data->name); + else if (code != 0) + exit(code); + data->helper = helper; data->no_disconnect_req = 0; |