diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-17 14:56:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-17 14:56:31 -0700 |
| commit | 7b8cfe34d9b36a08214ea7e3ae82e9563188de5e (patch) | |
| tree | 3e93bd39e629cadfecec9d3aa0e8955e40159826 /fsmonitor--daemon.h | |
| parent | d420dda0576340909c3faff364cfbd1485f70376 (diff) | |
| parent | c4f94907902f18d80a78ee19983d0d02932154d7 (diff) | |
| download | git-7b8cfe34d9b36a08214ea7e3ae82e9563188de5e.tar.gz | |
Merge branch 'ed/fsmonitor-on-networked-macos'
By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.
* ed/fsmonitor-on-networked-macos:
fsmonitor: fix leak of warning message
fsmonitor: add documentation for allowRemote and socketDir options
fsmonitor: check for compatability before communicating with fsmonitor
fsmonitor: deal with synthetic firmlinks on macOS
fsmonitor: avoid socket location check if using hook
fsmonitor: relocate socket file if .git directory is remote
fsmonitor: refactor filesystem checks to common interface
Diffstat (limited to 'fsmonitor--daemon.h')
| -rw-r--r-- | fsmonitor--daemon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fsmonitor--daemon.h b/fsmonitor--daemon.h index 2102a5c9ff..e24838f9a8 100644 --- a/fsmonitor--daemon.h +++ b/fsmonitor--daemon.h @@ -8,6 +8,7 @@ #include "run-command.h" #include "simple-ipc.h" #include "thread-utils.h" +#include "fsmonitor-path-utils.h" struct fsmonitor_batch; struct fsmonitor_token_data; @@ -43,6 +44,7 @@ struct fsmonitor_daemon_state { struct strbuf path_worktree_watch; struct strbuf path_gitdir_watch; + struct alias_info alias; int nr_paths_watching; struct fsmonitor_token_data *current_token_data; @@ -59,6 +61,7 @@ struct fsmonitor_daemon_state { struct ipc_server_data *ipc_server_data; struct strbuf path_ipc; + }; /* |