undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible

Browse Source 
On MacOS mark repos on NTFS or FAT32 volumes as incompatible.

The builtin FSMonitor used Unix domain sockets on MacOS for IPC
with clients.  These sockets are kept in the .git directory.
Unix sockets are not supported by NTFS and FAT32, so the daemon
cannot start up.

Test for this during our compatibility checking so that client
commands do not keep trying to start the daemon.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff Hostetler 2022-05-26 21:47:04 +00:00 committed by Junio C Hamano
parent d989b266c1
commit ddc5dacfb3
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compat/fsmonitor/fsm-settings-darwin.c
View File

@ -7,7 +7,7 @@
#include <sys/mount.h>
/*
* Remote working directories are problematic for FSMonitor.
* [1] Remote working directories are problematic for FSMonitor.
*
* The underlying file system on the server machine and/or the remote
* mount type (NFS, SAMBA, etc.) dictates whether notification events
@ -40,8 +40,16 @@
*
* So (for now at least), mark remote working directories as
* incompatible.
*
*
* [2] FAT32 and NTFS working directories are problematic too.
*
* The builtin FSMonitor uses a Unix domain socket in the .git
* directory for IPC. These Windows drive formats do not support
* Unix domain sockets, so mark them as incompatible for the daemon.
*
*/
static enum fsmonitor_reason check_remote(struct repository *r)
static enum fsmonitor_reason check_volume(struct repository *r)
{
struct statfs fs;
@ -60,6 +68,12 @@ static enum fsmonitor_reason check_remote(struct repository *r)
if (!(fs.f_flags & MNT_LOCAL))
return FSMONITOR_REASON_REMOTE;
if (!strcmp(fs.f_fstypename, "msdos")) /* aka FAT32 */
return FSMONITOR_REASON_NOSOCKETS;
if (!strcmp(fs.f_fstypename, "ntfs"))
return FSMONITOR_REASON_NOSOCKETS;
return FSMONITOR_REASON_OK;
}
@ -67,7 +81,7 @@ enum fsmonitor_reason fsm_os__incompatible(struct repository *r)
{
enum fsmonitor_reason reason;
reason = check_remote(r);
reason = check_volume(r);
if (reason != FSMONITOR_REASON_OK)
return reason;

6
fsmonitor-settings.c
View File

@ -225,6 +225,12 @@ char *fsm_settings__get_incompatible_msg(const struct repository *r,
_("virtual repository '%s' is incompatible with fsmonitor"),
r->worktree);
goto done;
case FSMONITOR_REASON_NOSOCKETS:
strbuf_addf(&msg,
_("repository '%s' is incompatible with fsmonitor due to lack of Unix sockets"),
r->worktree);
goto done;
}
BUG("Unhandled case in fsm_settings__get_incompatible_msg: '%d'",

1
fsmonitor-settings.h
View File

@ -20,6 +20,7 @@ enum fsmonitor_reason {
FSMONITOR_REASON_ERROR, /* FS error probing for compatibility */
FSMONITOR_REASON_REMOTE,
FSMONITOR_REASON_VFS4GIT, /* VFS for Git virtualization */
FSMONITOR_REASON_NOSOCKETS, /* NTFS,FAT32 do not support Unix sockets */
};
void fsm_settings__set_ipc(struct repository *r);