diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-05 18:54:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-05 18:54:31 -0400 |
| commit | f93fbf9c76d9709362b1a98c587745ecf9532b2e (patch) | |
| tree | e80f01e4249e314d03174c5fb15e883055ebec3a | |
| parent | 4f25721bdf437bc3dbf8ad621f8c60b93cb4dbee (diff) | |
| parent | b5c617b6232715f8109fa9eb2b77edae099f3a92 (diff) | |
Merge branch 'master' into watch
| -rw-r--r-- | doc/design/assistant/inotify.mdwn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn index 3b3e5dc56..2e79ee95d 100644 --- a/doc/design/assistant/inotify.mdwn +++ b/doc/design/assistant/inotify.mdwn @@ -83,6 +83,12 @@ Many races need to be dealt with by this code. Here are some of them. update-index` to manually put the symlink into the index without git looking at what's currently on disk. +* Link is moved, fixed link is written by fix event, but then that is + removed by the user and replaced with a file before the event finishes. + + Currently unfixed: `git add` will be run on the file. Basically same + effect as previous race above. + * File is removed and then re-added before the removal event starts. Not a problem; The removal event does nothing since the file exists, @@ -92,3 +98,4 @@ Many races need to be dealt with by this code. Here are some of them. Not a problem; The removal event removes the old file from the index, and the add event adds the new one. + |