inotify, windows: don't rename sibling watches sharing a path prefix#755
Merged
Merged
Conversation
The recursive-rename path-rewriting loop used strings.HasPrefix, so renaming /tmp/a to /tmp/x also rewrote watches on /tmp/ab to /tmp/xb. Match on a path-separator boundary instead. Same fix on Windows.
f3f2897 to
8ddbb10
Compare
Merged
1 task
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.
The recursive rename path-rewriting loops used
strings.HasPrefix(ww.path, old)to decide which watches belong under a renamed directory, so renaming/tmp/ato/tmp/xalso rewrote a sibling watch on/tmp/abto/tmp/xb(and on Windows,C:\root\a→C:\root\xrewroteC:\root\abtoC:\root\xb). Subsequent events were then misrouted. Match on a path-separator boundary so only the renamed directory and its real descendants are rewritten.Stacked on top of #754 (which fixes the same shape of bug in
removePath); merging that one first will simplify the diff.