]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ed/fsmonitor-on-networked-macos'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2022 21:56:31 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2022 21:56:31 +0000 (14:56 -0700)
By default, use of fsmonitor on a repository on networked
filesystem is disabled. Add knobs to make it workable on macOS.

* ed/fsmonitor-on-networked-macos:
  fsmonitor: fix leak of warning message
  fsmonitor: add documentation for allowRemote and socketDir options
  fsmonitor: check for compatability before communicating with fsmonitor
  fsmonitor: deal with synthetic firmlinks on macOS
  fsmonitor: avoid socket location check if using hook
  fsmonitor: relocate socket file if .git directory is remote
  fsmonitor: refactor filesystem checks to common interface

1  2 
Makefile
builtin/fsmonitor--daemon.c
contrib/buildsystems/CMakeLists.txt

diff --cc Makefile
Simple merge
Simple merge
Simple merge