git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-28 15:45:21 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fsmonitor--daemon: print start message only if fsmonitor.announceStartup

Browse Source 
Teach fsmonitor--daemon to print a startup message only when
`fsmonitor.announceStartup` is true.  This setting is false by default
so that the output of client commands, like `git status`, is not
changed if the daemon is implicitly started.

The message is conditionally printed by "run" and "start" subcommands
and is sent to stderr.  It contains the path to the work tree root.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
This commit is contained in:
Jeff Hostetler
2021-08-30 13:03:57 -04:00
committed by Victoria Dye
parent 6eb437f5fc
commit 257fd1f4c2
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
builtin/fsmonitor--daemon.c
View File

@@ -27,6 +27,9 @@ static int fsmonitor__ipc_threads = 8;
#define FSMONITOR__START_TIMEOUT "fsmonitor.starttimeout"
static int fsmonitor__start_timeout_sec = 60;
#define FSMONITOR__ANNOUNCE_STARTUP "fsmonitor.announcestartup"
static int fsmonitor__announce_startup = 0;
static int fsmonitor_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, FSMONITOR__IPC_THREADS)) {
@@ -47,6 +50,16 @@ static int fsmonitor_config(const char *var, const char *value, void *cb)
return 0;
}
if (!strcmp(var, FSMONITOR__ANNOUNCE_STARTUP)) {
int is_bool;
int i = git_config_bool_or_int(var, value, &is_bool);
if (i < 0)
return error(_("value of '%s' not bool or int: %d"),
var, i);
fsmonitor__announce_startup = i;
return 0;
}
return git_default_config(var, value, cb);
}
@@ -1307,9 +1320,11 @@ static int try_to_run_foreground_daemon(int free_console)
die("fsmonitor--daemon is already running '%s'",
the_repository->worktree);
printf(_("running fsmonitor-daemon in '%s'\n"),
the_repository->worktree);
fflush(stdout);
if (fsmonitor__announce_startup) {
fprintf(stderr, _("running fsmonitor-daemon in '%s'\n"),
the_repository->worktree);
fflush(stderr);
}
#ifdef GIT_WINDOWS_NATIVE
if (free_console)
@@ -1360,9 +1375,11 @@ static int try_to_start_background_daemon(void)
die("fsmonitor--daemon is already running '%s'",
the_repository->worktree);
printf(_("starting fsmonitor-daemon in '%s'\n"),
the_repository->worktree);
fflush(stdout);
if (fsmonitor__announce_startup) {
fprintf(stderr, _("starting fsmonitor-daemon in '%s'\n"),
the_repository->worktree);
fflush(stderr);
}
cp.git_cmd = 1;