From: Johannes Schindelin <johannes.schindelin@xxxxxx>
Especially on Windows, we will need to stop that daemon, just in case
that the directory needs to be removed (the daemon would otherwise hold
a handle to that directory, preventing it from being deleted).
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
Signed-off-by: Victoria Dye <vdye@xxxxxxxxxx>
---
contrib/scalar/scalar.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c
index 219e414ab4e..b774eb044ec 100644
--- a/contrib/scalar/scalar.c
+++ b/contrib/scalar/scalar.c
@@ -272,6 +272,33 @@ static int start_fsmonitor_daemon(void)
return res;
}
+static int stop_fsmonitor_daemon(void)
+{
+ int res = 0;
+ if (fsmonitor_ipc__is_supported()) {
+ struct strbuf err = STRBUF_INIT;
+ struct child_process cp = CHILD_PROCESS_INIT;
+
+ /* Try to stop the FSMonitor daemon */
+ cp.git_cmd = 1;
+ strvec_pushl(&cp.args, "fsmonitor--daemon", "stop", NULL);
+ if (!pipe_command(&cp, NULL, 0, NULL, 0, &err, 0)) {
+ /* Successfully stopped FSMonitor */
+ strbuf_release(&err);
+ return 0;
+ }
+
+ /* If FSMonitor really hasn't stopped, emit error */
+ if (fsmonitor_ipc__get_state() == IPC_STATE__LISTENING)
+ res = error(_("could not stop the FSMonitor daemon: %s"),
+ err.buf);
+
+ strbuf_release(&err);
+ }
+
+ return res;
+}
+
static int register_dir(void)
{
int res = add_or_remove_enlistment(1);
@@ -298,6 +325,9 @@ static int unregister_dir(void)
if (add_or_remove_enlistment(0) < 0)
res = -1;
+ if (stop_fsmonitor_daemon() < 0)
+ res = -1;
+
return res;
}
--
gitgitgadget
