fsmonitor: avoid socket location check if using hook

edecosta-mw · gitster · commit 8f44976882b7 · 2022-10-05T11:05:23.000-07:00
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 &lt;edecosta@mathworks.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/fsmonitor/fsm-settings-darwin.c b/compat/fsmonitor/fsm-settings-darwin.c
@@ -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;
 }
diff --git 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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -48,13 +48,15 @@ static enum fsmonitor_reason check_uds_volume(struct repository *r)`
`48`	`48`	`return FSMONITOR_REASON_OK;`
`49`	`49`	`}`
`50`	`50`
`51`		`-enum fsmonitor_reason fsm_os__incompatible(struct repository *r)`
	`51`	`+enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)`
`52`	`52`	`{`
`53`	`53`	`enum fsmonitor_reason reason;`
`54`	`54`
`55`		`- reason = check_uds_volume(r);`
`56`		`- if (reason != FSMONITOR_REASON_OK)`
`57`		`- return reason;`
	`55`	`+ if (ipc) {`
	`56`	`+ reason = check_uds_volume(r);`
	`57`	`+ if (reason != FSMONITOR_REASON_OK)`
	`58`	`+ return reason;`
	`59`	`+ }`
`58`	`60`
`59`	`61`	`return FSMONITOR_REASON_OK;`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ static enum fsmonitor_reason check_vfs4git(struct repository *r)`
`25`	`25`	`return FSMONITOR_REASON_OK;`
`26`	`26`	`}`
`27`	`27`
`28`		`-enum fsmonitor_reason fsm_os__incompatible(struct repository *r)`
	`28`	`+enum fsmonitor_reason fsm_os__incompatible(struct repository *r, int ipc)`
`29`	`29`	`{`
`30`	`30`	`enum fsmonitor_reason reason;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ static enum fsmonitor_reason check_remote(struct repository *r)`
`60`	`60`	`}`
`61`	`61`	`#endif`
`62`	`62`
`63`		`-static enum fsmonitor_reason check_for_incompatible(struct repository *r)`
	`63`	`+static enum fsmonitor_reason check_for_incompatible(struct repository *r, int ipc)`
`64`	`64`	`{`
`65`	`65`	`if (!r->worktree) {`
`66`	`66`	`/*`
`@@ -77,7 +77,7 @@ static enum fsmonitor_reason check_for_incompatible(struct repository *r)`
`77`	`77`	`reason = check_remote(r);`
`78`	`78`	`if (reason != FSMONITOR_REASON_OK)`
`79`	`79`	`return reason;`
`80`		`- reason = fsm_os__incompatible(r);`
	`80`	`+ reason = fsm_os__incompatible(r, ipc);`
`81`	`81`	`if (reason != FSMONITOR_REASON_OK)`
`82`	`82`	`return reason;`
`83`	`83`	`}`
`@@ -162,7 +162,7 @@ const char fsm_settings__get_hook_path(struct repository r)`
`162`	`162`
`163`	`163`	`void fsm_settings__set_ipc(struct repository *r)`
`164`	`164`	`{`
`165`		`- enum fsmonitor_reason reason = check_for_incompatible(r);`
	`165`	`+ enum fsmonitor_reason reason = check_for_incompatible(r, 1);`
`166`	`166`
`167`	`167`	`if (reason != FSMONITOR_REASON_OK) {`
`168`	`168`	`fsm_settings__set_incompatible(r, reason);`
`@@ -185,7 +185,7 @@ void fsm_settings__set_ipc(struct repository *r)`
`185`	`185`
`186`	`186`	`void fsm_settings__set_hook(struct repository r, const char path)`
`187`	`187`	`{`
`188`		`- enum fsmonitor_reason reason = check_for_incompatible(r);`
	`188`	`+ enum fsmonitor_reason reason = check_for_incompatible(r, 0);`
`189`	`189`
`190`	`190`	`if (reason != FSMONITOR_REASON_OK) {`
`191`	`191`	`fsm_settings__set_incompatible(r, reason);`