Skip to content

fixup! fsmonitor: reintroduce core.useBuiltinFSMonitor #3783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 11, 2022
Merged

fixup! fsmonitor: reintroduce core.useBuiltinFSMonitor #3783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions fsmonitor-settings.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,24 @@ static int check_for_incompatible(struct repository *r)

static int check_deprecated_builtin_config(struct repository *r)
{
int core_use_builtin_fsmonitor;
int core_use_builtin_fsmonitor = 0;

/*
* If 'core.useBuiltinFSMonitor' is set, print a deprecation warning
* suggesting the use of 'core.fsmonitor' instead. If the config is
* set to true, set the appropriate mode and return 1 indicating that
* the check resulted the config being set by this (deprecated) setting.
*/
if(!repo_config_get_bool(r, "core.useBuiltinFSMonitor", &core_use_builtin_fsmonitor)) {
if(!repo_config_get_bool(r, "core.useBuiltinFSMonitor", &core_use_builtin_fsmonitor) &&
core_use_builtin_fsmonitor) {
if (!git_env_bool("GIT_SUPPRESS_USEBUILTINFSMONITOR_ADVICE", 0)) {
advise_if_enabled(ADVICE_USE_CORE_FSMONITOR_CONFIG,
_("core.useBuiltinFSMonitor will be deprecated "
"soon; use core.fsmonitor instead"));
setenv("GIT_SUPPRESS_USEBUILTINFSMONITOR_ADVICE", "1", 1);
}
if (core_use_builtin_fsmonitor) {
fsm_settings__set_ipc(r);
return 1;
}
fsm_settings__set_ipc(r);
return 1;
}

return 0;
Expand Down