]> git.ipfire.org Git - thirdparty/git.git/commit
fsmonitor: deal with synthetic firmlinks on macOS
authorEric DeCosta <edecosta@mathworks.com>
Tue, 4 Oct 2022 17:32:29 +0000 (17:32 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Oct 2022 18:05:23 +0000 (11:05 -0700)
commit12fd27df79ac5f2589b54c8f36761d066dc9a97e
tree75232a9616936ceea554a9c82b1d432e43e49ba9
parent8f44976882b77bb3b9ac0579a04ef05cbea5bdb2
fsmonitor: deal with synthetic firmlinks on macOS

Starting with macOS 10.15 (Catalina), Apple introduced a new feature
called 'firmlinks' in order to separate the boot volume into two
volumes, one read-only and one writable but still present them to the
user as a single volume. Along with this change, Apple removed the
ability to create symlinks in the root directory and replaced them with
'synthetic firmlinks'. See 'man synthetic.conf'

When FSEevents reports the path of changed files, if the path involves
a synthetic firmlink, the path is reported from the point of the
synthetic firmlink and not the real path. For example:

Real path:
/System/Volumes/Data/network/working/directory/foo.txt

Synthetic firmlink:
/network -> /System/Volumes/Data/network

FSEvents path:
/network/working/directory/foo.txt

This causes the FSEvents path to not match against the worktree
directory.

There are several ways in which synthetic firmlinks can be created:
they can be defined in /etc/synthetic.conf, the automounter can create
them, and there may be other means. Simply reading /etc/synthetic.conf
is insufficient. No matter what process creates synthetic firmlinks,
they all get created in the root directory.

Therefore, in order to deal with synthetic firmlinks, the root directory
is scanned and the first possible synthetic firmink that, when resolved,
is a prefix of the worktree is used to map FSEvents paths to worktree
paths.

Signed-off-by: Eric DeCosta <edecosta@mathworks.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fsmonitor--daemon.c
compat/fsmonitor/fsm-listen-darwin.c
compat/fsmonitor/fsm-path-utils-darwin.c
compat/fsmonitor/fsm-path-utils-win32.c
fsmonitor--daemon.h
fsmonitor-path-utils.h