Re: [PATCH v2 4/8] t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE
From: Derrick Stolee <hidden>
Date: 2019-12-10 13:45:31
On 12/10/2019 5:07 AM, SZEDER Gábor wrote:
On Mon, Dec 09, 2019 at 04:10:00PM +0000, Derrick Stolee via GitGitGadget wrote:quoted
From: Derrick Stolee <redacted> The fsmonitor feature allows an external tool such as watchman to monitor the working directory. The direct test t7619-status-fsmonitor.sh provides some coverage, but it would be better to run the entire test suite with watchman enabled. This would provide more confidence that the feature is working as intended. Worktrees use a ".git" _file_ instead of a folder to point to the base repo's .git directory and the proper worktree HEAD. The fsmonitor hook tries to create a JSON file inside the ".git" folder which violates the expectation here.Yeah, there are a couple hardcoded paths in there, e.g.: open ($fh, ">", ".git/watchman-response.json"); and, worse, not only in the test helper hook in 't/t7519/fsmonitor-watchman' but in the sample hook template 'templates/hooks--fsmonitor-watchman.sample' as well.quoted
It would be better to properly find a safe folder for storing this JSON file.git rev-parse --git-path '' gives us the right directory prefix to use and we could then append the various filenames that must be accessed in there.
Adding another git process inside the hook is hopefully not the only way to achieve something like this. The performance hit (mostly on Windows) would be a non-starter for me. (Yes, the process creation to watchman is already a cost here, but let's not make it worse.) Perhaps a better strategy would be to do something in-memory instead of writing to a file. Not sure how much of that can be done in the script. -Stolee