mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
fsmonitor: avoid socket location check if using hook
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. Signed-off-by: Eric DeCosta <edecosta@mathworks.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6beb2688d3
commit
8f44976882
|
@ -48,13 +48,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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue