query-watchman error when working in a worktree

[marcodejongh]

When I use worktree I get a query watchmen error for every git command:

mdejongh@C02XP02SJGH7|~/Projects/Atlassian/a-f2 on RenovateSharedConfig
± git status
fatal: cannot exec '.git/hooks/query-watchman': Not a directory
On branch RenovateSharedConfig
nothing to commit, working tree clean
mdejongh@C02XP02SJGH7|~/Projects/Atlassian/a-f2 on RenovateSharedConfig
±

I set my repo up using scalar register instead of clone, so figured maybe the old worktree's I had when I ran register were broken. But creating a new worktree from the main checkout, also returns a error:

mdejongh@C02XP02SJGH7|~/Projects/Atlassian/atlassian-frontend on master
± git worktree add ../a-f9 bla
Preparing worktree (checking out 'bla')
fatal: cannot exec '.git/hooks/query-watchman': Not a directory
Can't find Husky, skipping post-checkout hook
You can reinstall it using 'npm install husky --save-dev' or delete this hook
mdejongh@C02XP02SJGH7|~/Projects/Atlassian/atlassian-frontend on master
±

[jrbriggs]

Thanks for the report, @marcodejongh ! We'll take a look.

[derrickstolee]

Scalar can be improved to handle worktrees. In particular, we should probably set our fsmonitor hook setting in the worktree config (using git config --worktree ...) and then enable the ability in this worktree. I believe that Scalar will ignore the worktree if you try to run scalar register or scalar run config in the worktree.

@marcodejongh: you may be able to get out of this state by doing one of the following:

1. Disable the hook in your worktree: git config --worktree core.fsmonitor ""
2. Move the hook to your base dir hooks directory: git config core.fsmonitor "/full/path/to/repo/.git/hooks/query-fsmonitor"

Perhaps it is enough for Scalar to discover the fully-rooted path and use that in the config.

[derrickstolee]

@marcodejongh: This will be fixed in the next release. In my testing, my existing, incorrect config values were upgraded to the new values shortly after installing my new version (since we run scalar run config on every registered repo). For now, you can replace the core.fsmonitor config value with a fully-scoped path <repo>/.git/hooks/query-watchman.

[marcodejongh]

Thanks will do!

[devinrhode2]

For anybody just googling - I am not using scaler, just git worktrees. At some point I enabled the query-watchman hook per the instructions here: https://github.com/git/git/blob/v2.28.0/templates/hooks--fsmonitor-watchman.sample
Then, adding a worktree, I could see this:

master ➤ git worktree add ../aCoWorker
Preparing worktree (new branch 'aCoWorker')
fatal: cannot exec '.git/hooks/query-watchman': Not a directory
fatal: cannot exec '.git/hooks/query-watchman': Not a directory
HEAD is now at ...

Fix from @derrickstolee worked great!
Just cd to main/original/host repo/worktree. Edit .git/config, and change core.fsmonitor config value to a fully-scoped path to the query-watchman file (<repo>/.git/hooks/query-watchman)