fsmonitor/darwin: fix hangs for submodules

fsmonitor_classify_path_absolute() expects state->path_gitdir_watch.buf
has no trailing '/' or '.' For a submodule, fsmonitor_run_daemon() sets
the value with trailing "/." (as repo_get_git_dir(the_repository) on
darwin returns ".") so that fsmonitor_classify_path_absolute() returns
IS_OUTSIDE_CONE.

In this case, fsevent_callback() doesn't update cookie_list so that
fsmonitor_publish() does nothing and with_lock__mark_cookies_seen() is
not invoked.

As with_lock__wait_for_cookie() infinitely waits for state->cookies_cond
that with_lock__mark_cookies_seen() should unlock, the whole daemon
hangs.

Remove trailing "/." from state->path_gitdir_watch.buf for submodules.

Signed-off-by: Koji Nakamaru <[email protected]>

Author: KojiNakamaru

builtin/fsmonitor--daemon.c

@@ -1311,9 +1311,15 @@ static int fsmonitor_run_daemon(void)
 	strbuf_addbuf(&state.path_gitdir_watch, &state.path_worktree_watch);
 	strbuf_addstr(&state.path_gitdir_watch, "/.git");
 	if (!is_directory(state.path_gitdir_watch.buf)) {
+		char *buf;
+		int len;
 		strbuf_reset(&state.path_gitdir_watch);
 		strbuf_addstr(&state.path_gitdir_watch,
 			      absolute_path(repo_get_git_dir(the_repository)));
+		buf = state.path_gitdir_watch.buf;
+		len = state.path_gitdir_watch.len;
+		if (len >= 2 && buf[len - 2] == '/' && buf[len - 1] == '.')
+			strbuf_setlen(&state.path_gitdir_watch, len - 2);
 		state.nr_paths_watching = 2;
 	}