From 99e4fefe7a782854c5f4740c44de9c34a069ba7a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 28 Apr 2022 17:34:50 +0200 Subject: [PATCH] fixup! fsmonitor: reintroduce core.useBuiltinFSMonitor The phrasing confused some users to believe that the built-in FSMonitor was deprecated altogether. Let's try to clear that up. Signed-off-by: Johannes Schindelin --- fsmonitor-settings.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c index 70d9fbc2eb..0c31dd95ae 100644 --- a/fsmonitor-settings.c +++ b/fsmonitor-settings.c @@ -62,8 +62,8 @@ static int check_deprecated_builtin_config(struct repository *r) 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")); + _("core.useBuiltinFSMonitor=true is deprecated;" + "please set core.fsmonitor=true instead")); setenv("GIT_SUPPRESS_USEBUILTINFSMONITOR_ADVICE", "1", 1); } fsm_settings__set_ipc(r);