git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-27 07:26:22 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! fsmonitor--daemon: background daemon must free the console on windows

Browse Source 
This reverts commit e3fc6efce3.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Jeff Hostetler
2021-09-29 15:14:13 -04:00
committed by Johannes Schindelin
parent 627671214f
commit 1a545a1fa0
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/fsmonitor--daemon.c
View File

@@ -1302,7 +1302,7 @@ done:
return err;
}
static int try_to_run_foreground_daemon(int free_console)
static int try_to_run_foreground_daemon(void)
{
/*
* Technically, we don't need to probe for an existing daemon
@@ -1320,11 +1320,6 @@ static int try_to_run_foreground_daemon(int free_console)
the_repository->worktree);
fflush(stdout);
#ifdef GIT_WINDOWS_NATIVE
if (free_console)
FreeConsole();
#endif
return !!fsmonitor_run_daemon();
}
@@ -1356,7 +1351,6 @@ static int spawn_fsmonitor(pid_t *pid)
strvec_push(&args, git_exe);
strvec_push(&args, "fsmonitor--daemon");
strvec_push(&args, "run");
strvec_push(&args, "--free-console");
strvec_pushf(&args, "--ipc-threads=%d", fsmonitor__ipc_threads);
*pid = mingw_spawnvpe(args.v[0], args.v, NULL, NULL, in, out, out);
@@ -1520,10 +1514,8 @@ static int try_to_start_background_daemon(void)
int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
{
const char *subcmd;
int free_console = 0;
struct option options[] = {
OPT_BOOL(0, "free-console", &free_console, N_("free console")),
OPT_INTEGER(0, "ipc-threads",
&fsmonitor__ipc_threads,
N_("use <n> ipc worker threads")),
@@ -1567,7 +1559,7 @@ int cmd_fsmonitor__daemon(int argc, const char **argv, const char *prefix)
return !!try_to_start_background_daemon();
if (!strcmp(subcmd, "run"))
return !!try_to_run_foreground_daemon(free_console);
return !!try_to_run_foreground_daemon();
if (!strcmp(subcmd, "stop"))
return !!do_as_client__send_stop();