Merge branch 'jk/revert-aa-reap-transport-child-processes'
Revert a recent change that introduced a regression to help mksh users. * jk/revert-aa-reap-transport-child-processes: Revert "transport-helper, connect: use clean_on_exit to reap children on abnormal exit"main
commit
a3325b06a3
|
|
@ -1054,8 +1054,6 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
|
||||||
strvec_push(&proxy->args, port);
|
strvec_push(&proxy->args, port);
|
||||||
proxy->in = -1;
|
proxy->in = -1;
|
||||||
proxy->out = -1;
|
proxy->out = -1;
|
||||||
proxy->clean_on_exit = 1;
|
|
||||||
proxy->wait_after_clean = 1;
|
|
||||||
if (start_command(proxy))
|
if (start_command(proxy))
|
||||||
die(_("cannot start proxy %s"), git_proxy_command);
|
die(_("cannot start proxy %s"), git_proxy_command);
|
||||||
fd[0] = proxy->out; /* read from proxy stdout */
|
fd[0] = proxy->out; /* read from proxy stdout */
|
||||||
|
|
@ -1517,8 +1515,6 @@ struct child_process *git_connect(int fd[2], const char *url,
|
||||||
}
|
}
|
||||||
strvec_push(&conn->args, cmd.buf);
|
strvec_push(&conn->args, cmd.buf);
|
||||||
|
|
||||||
conn->clean_on_exit = 1;
|
|
||||||
conn->wait_after_clean = 1;
|
|
||||||
if (start_command(conn))
|
if (start_command(conn))
|
||||||
die(_("unable to fork"));
|
die(_("unable to fork"));
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,8 +154,6 @@ static struct child_process *get_helper(struct transport *transport)
|
||||||
|
|
||||||
helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
|
helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
|
||||||
|
|
||||||
helper->clean_on_exit = 1;
|
|
||||||
helper->wait_after_clean = 1;
|
|
||||||
code = start_command(helper);
|
code = start_command(helper);
|
||||||
if (code < 0 && errno == ENOENT)
|
if (code < 0 && errno == ENOENT)
|
||||||
die(_("unable to find remote helper for '%s'"), data->name);
|
die(_("unable to find remote helper for '%s'"), data->name);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue