> -----Original Message----- > From: Junio C Hamano <jch2355@xxxxxxxxx> On Behalf Of Junio C Hamano > Sent: Monday, September 12, 2022 11:36 AM > To: Eric DeCosta via GitGitGadget <gitgitgadget@xxxxxxxxx> > Cc: git@xxxxxxxxxxxxxxx; Jeff Hostetler <git@xxxxxxxxxxxxxxxxx>; Eric Sunshine > <sunshine@xxxxxxxxxxxxxx>; Torsten Bögershausen <tboegi@xxxxxx>; > Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>; Ramsay Jones > <ramsay@xxxxxxxxxxxxxxxxxxxx>; Johannes Schindelin > <Johannes.Schindelin@xxxxxx>; Eric DeCosta <edecosta@xxxxxxxxxxxxx> > Subject: Re: [PATCH v5 0/4] fsmonitor: option to allow fsmonitor to run > against network-mounted repos > > "Eric DeCosta via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > Eric DeCosta (4): > > fsmonitor: refactor filesystem checks to common interface > > fsmonitor: relocate socket file if .git directory is remote > > fsmonitor: avoid socket location check if using hook > > fsmonitor: deal with synthetic firmlinks on macOS > > > > Makefile | 2 + > > builtin/fsmonitor--daemon.c | 8 ++ > > compat/fsmonitor/fsm-ipc-darwin.c | 46 ++++++++ > > compat/fsmonitor/fsm-ipc-win32.c | 4 + > > compat/fsmonitor/fsm-listen-darwin.c | 6 +- > > compat/fsmonitor/fsm-path-utils-darwin.c | 131 > > +++++++++++++++++++++++ compat/fsmonitor/fsm-path-utils-win32.c | > 106 ++++++++++++++++++ > > compat/fsmonitor/fsm-settings-darwin.c | 70 ++++-------- > > compat/fsmonitor/fsm-settings-win32.c | 106 +----------------- > > contrib/buildsystems/CMakeLists.txt | 4 + > > fsmonitor--daemon.h | 6 ++ > > fsmonitor-ipc.c | 2 - > > fsmonitor-path-utils.h | 49 +++++++++ > > fsmonitor-settings.c | 58 +++++++++- > > fsmonitor-settings.h | 2 +- > > 15 files changed, 441 insertions(+), 159 deletions(-) create mode > > 100644 compat/fsmonitor/fsm-ipc-darwin.c create mode 100644 > > compat/fsmonitor/fsm-ipc-win32.c create mode 100644 > > compat/fsmonitor/fsm-path-utils-darwin.c > > create mode 100644 compat/fsmonitor/fsm-path-utils-win32.c > > create mode 100644 fsmonitor-path-utils.h > > > > > > base-commit: be1a02a17ede4082a86dfbfee0f54f345e8b43ac > > Another curious thing I need your help on. > > The cover letter says that this work is a follow-up to extend the previous > work for Windows, and I would have expected these patches to build on > 85dc0da6 (fsmonitor: option to allow fsmonitor to run against network- > mounted repos, 2022-08-11), which is not yet in > be1a02a1 (The seventeenth batch, 2022-09-01). > > What is going on? > > Thanks. I've been rolling that around in the back of my head over the last couple of days actually. Initially I though the macOS changes were going to be independent of my earlier changes, but with all the refactoring that has occurred, that is no longer the case. I've rebased my current patch set on top of those earlier changes. v6 will incorporate that, the review feedback that I've received so far and add doc for the new config options. I'll be sure to note all of this in the cover letter for v6. -Eric
