undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error message when a transport helper was not found

Browse Source 
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>
This commit is contained in:
Ilari Liusvaara 2010-01-12 20:53:29 +01:00 committed by Junio C Hamano
parent 2b541bf8be
commit 6b02de3b9d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
transport-helper.c
View File

@ -102,6 +102,7 @@ static struct child_process *get_helper(struct transport *transport)
int refspec_nr = 0; int refspec_nr = 0;
int refspec_alloc = 0; int refspec_alloc = 0;
int duped; int duped;
int code;
if (data->helper) if (data->helper)
return data->helper; return data->helper;
@ -111,13 +112,18 @@ static struct child_process *get_helper(struct transport *transport)
helper->out = -1; helper->out = -1;
helper->err = 0; helper->err = 0;
helper->argv = xcalloc(4, sizeof(*helper->argv)); 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[0] = strbuf_detach(&buf, NULL);
helper->argv[1] = transport->remote->name; helper->argv[1] = transport->remote->name;
helper->argv[2] = remove_ext_force(transport->url); helper->argv[2] = remove_ext_force(transport->url);
helper->git_cmd = 1; helper->git_cmd = 0;
if (start_command(helper)) helper->silent_exec_failure = 1;
die("Unable to run helper: git %s", helper->argv[0]); 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->helper = helper;
data->no_disconnect_req = 0; data->no_disconnect_req = 0;