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-settings.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-settings.h')
| -rw-r--r-- | fsmonitor-settings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fsmonitor-settings.h b/fsmonitor-settings.h index d9c2605197..ab02e3995e 100644 --- a/fsmonitor-settings.h +++ b/fsmonitor-settings.h @@ -33,7 +33,7 @@ enum fsmonitor_mode fsm_settings__get_mode(struct repository *r); const char *fsm_settings__get_hook_path(struct repository *r); enum fsmonitor_reason fsm_settings__get_reason(struct repository *r); -char *fsm_settings__get_incompatible_msg(const struct repository *r, +char *fsm_settings__get_incompatible_msg(struct repository *r, enum fsmonitor_reason reason); struct fsmonitor_settings; @@ -48,7 +48,7 @@ struct fsmonitor_settings; * fsm_os__* routines should considered private to fsm_settings__ * routines. */ -enum fsmonitor_reason fsm_os__incompatible(struct repository *r); +enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc); #endif /* HAVE_FSMONITOR_OS_SETTINGS */ #endif /* FSMONITOR_SETTINGS_H */ |