"Eric DeCosta via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> From: Eric DeCosta <edecosta@xxxxxxxxxxxxx>
>
> If monitoring is done via fsmonitor hook rather than IPC there is no
> need to check if the location of the Unix Domain socket (UDS) file is
> on a remote filesystem.
Nicely done.
>
> Signed-off-by: Eric DeCosta <edecosta@xxxxxxxxxxxxx>
> ---
> compat/fsmonitor/fsm-settings-darwin.c | 10 ++++++----
> compat/fsmonitor/fsm-settings-win32.c | 2 +-
> fsmonitor-settings.c | 8 ++++----
> fsmonitor-settings.h | 2 +-
> 4 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c
> index dba3ced6bb7..3463c71763e 100644
> --- a/compat/fsmonitor/fsm-settings-darwin.c
> +++ b/compat/fsmonitor/fsm-settings-darwin.c
> @@ -49,13 +49,15 @@ static enum fsmonitor_reason check_uds_volume(struct repository *r)
> return FSMONITOR_REASON_OK;
> }
>
> -enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
> +enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)
> {
> enum fsmonitor_reason reason;
>
> - reason = check_uds_volume(r);
> - if (reason != FSMONITOR_REASON_OK)
> - return reason;
> + if (ipc) {
> + reason = check_uds_volume(r);
> + if (reason != FSMONITOR_REASON_OK)
> + return reason;
> + }
>
> return FSMONITOR_REASON_OK;
> }
> diff --git a/compat/fsmonitor/fsm-settings-win32.c b/compat/fsmonitor/fsm-settings-win32.c
> index d88b06ae610..a8af31b71de 100644
> --- a/compat/fsmonitor/fsm-settings-win32.c
> +++ b/compat/fsmonitor/fsm-settings-win32.c
> @@ -25,7 +25,7 @@ static enum fsmonitor_reason check_vfs4git(struct repository *r)
> return FSMONITOR_REASON_OK;
> }
>
> -enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
> +enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)
> {
> enum fsmonitor_reason reason;
>
> diff --git a/fsmonitor-settings.c b/fsmonitor-settings.c
> index d288cbad479..531a1b6f956 100644
> --- a/fsmonitor-settings.c
> +++ b/fsmonitor-settings.c
> @@ -60,7 +60,7 @@ static enum fsmonitor_reason check_remote(struct repository *r)
> }
> #endif
>
> -static enum fsmonitor_reason check_for_incompatible(struct repository *r)
> +static enum fsmonitor_reason check_for_incompatible(struct repository *r, int ipc)
> {
> if (!r->worktree) {
> /*
> @@ -77,7 +77,7 @@ static enum fsmonitor_reason check_for_incompatible(struct repository *r)
> reason = check_remote(r);
> if (reason != FSMONITOR_REASON_OK)
> return reason;
> - reason = fsm_os__incompatible(r);
> + reason = fsm_os__incompatible(r, ipc);
> if (reason != FSMONITOR_REASON_OK)
> return reason;
> }
> @@ -162,7 +162,7 @@ const char *fsm_settings__get_hook_path(struct repository *r)
>
> void fsm_settings__set_ipc(struct repository *r)
> {
> - enum fsmonitor_reason reason = check_for_incompatible(r);
> + enum fsmonitor_reason reason = check_for_incompatible(r, 1);
>
> if (reason != FSMONITOR_REASON_OK) {
> fsm_settings__set_incompatible(r, reason);
> @@ -185,7 +185,7 @@ void fsm_settings__set_ipc(struct repository *r)
>
> void fsm_settings__set_hook(struct repository *r, const char *path)
> {
> - enum fsmonitor_reason reason = check_for_incompatible(r);
> + enum fsmonitor_reason reason = check_for_incompatible(r, 0);
>
> if (reason != FSMONITOR_REASON_OK) {
> fsm_settings__set_incompatible(r, reason);
> diff --git a/fsmonitor-settings.h b/fsmonitor-settings.h
> index d9c2605197f..0721617b95a 100644
> --- a/fsmonitor-settings.h
> +++ b/fsmonitor-settings.h
> @@ -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 */
