mirror of
https://github.com/git/git.git
synced 2024-05-25 10:06:14 +02:00
replace and remove run_command_v_opt_tr2()
The convenience function run_command_v_opt_tr2() is only used by a single caller. Use struct child_process and run_command() directly instead and remove the underused function. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
parent
eb5b6b57d0
commit
d82dbbd849
|
@ -54,10 +54,14 @@ enum ipc_active_state fsmonitor_ipc__get_state(void)
|
||||||
|
|
||||||
static int spawn_daemon(void)
|
static int spawn_daemon(void)
|
||||||
{
|
{
|
||||||
const char *args[] = { "fsmonitor--daemon", "start", NULL };
|
struct child_process cmd = CHILD_PROCESS_INIT;
|
||||||
|
|
||||||
return run_command_v_opt_tr2(args, RUN_COMMAND_NO_STDIN | RUN_GIT_CMD,
|
cmd.git_cmd = 1;
|
||||||
"fsmonitor");
|
cmd.no_stdin = 1;
|
||||||
|
cmd.trace2_child_class = "fsmonitor";
|
||||||
|
strvec_pushl(&cmd.args, "fsmonitor--daemon", "start", NULL);
|
||||||
|
|
||||||
|
return run_command(&cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
int fsmonitor_ipc__send_query(const char *since_token,
|
int fsmonitor_ipc__send_query(const char *since_token,
|
||||||
|
|
|
@ -1009,11 +1009,6 @@ int run_command_v_opt(const char **argv, int opt)
|
||||||
return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, NULL);
|
return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class)
|
|
||||||
{
|
|
||||||
return run_command_v_opt_cd_env_tr2(argv, opt, NULL, NULL, tr2_class);
|
|
||||||
}
|
|
||||||
|
|
||||||
int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
|
int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
|
||||||
const char *const *env, const char *tr2_class)
|
const char *const *env, const char *tr2_class)
|
||||||
{
|
{
|
||||||
|
|
|
@ -244,7 +244,6 @@ int run_auto_maintenance(int quiet);
|
||||||
* corresponds to the member .env.
|
* corresponds to the member .env.
|
||||||
*/
|
*/
|
||||||
int run_command_v_opt(const char **argv, int opt);
|
int run_command_v_opt(const char **argv, int opt);
|
||||||
int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);
|
|
||||||
/*
|
/*
|
||||||
* env (the environment) is to be formatted like environ: "VAR=VALUE".
|
* env (the environment) is to be formatted like environ: "VAR=VALUE".
|
||||||
* To unset an environment variable use just "VAR".
|
* To unset an environment variable use just "VAR".
|
||||||
|
|
Loading…
Reference in New Issue