ConfigStep: use full hook path for fsmonitor#340
Merged
Conversation
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
force-pushed
the
fsmonitor-fullpath
branch
from
ad1c17d to
0d1e79c
Compare
kewillford
approved these changes
Feb 24, 2020
Member
kewillford
left a comment
kewillford
left a comment
There was a problem hiding this comment.
Seems this is the issue and the fact that we set core.fsmonitor to .git/hooks/.... I don't know why this wasn't using find_hook to begin with since it is in the hooks directory. Maybe it was to have the flexibility of setting the core.fsmonitor to any location and not have to put it in the hooks directory of the repository? Since that seems to be the case, this change makes sense to me.
And I agree that there needs to be more test cases around worktrees.
Contributor
Author
I added #341 to track this work. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #338.
This appears to be the issue:
scalar registerin a repository that has worktrees.core.fsmonitorconfig setting..git/hooks/query-watchman, but that is not a path relative to the worktree.This fixes the configs setting.
I've tested this on my Windows machine with a worktree of git/git.
Cc: @kewillford the expert on fsmonitor. As a longer plan, we should consider adding tests that cover the case for worktrees.