summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-06 14:33:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-06 14:33:12 -0400
commit899334223f4c46307af6c34ae103971b5f37ce8f (patch)
treeaff6ab66968cbf654618b14bca2cb4fbb2f36279 /doc
parent455fca65bfb9ca4270fa7f89986d09ee62188d43 (diff)
fixed 2 races! Only 1 serious race to go!
Diffstat (limited to 'doc')
-rw-r--r--doc/design/assistant/inotify.mdwn8
1 files changed, 3 insertions, 5 deletions
diff --git a/doc/design/assistant/inotify.mdwn b/doc/design/assistant/inotify.mdwn
index e7c61c68b..079941f59 100644
--- a/doc/design/assistant/inotify.mdwn
+++ b/doc/design/assistant/inotify.mdwn
@@ -82,16 +82,14 @@ Many races need to be dealt with by this code. Here are some of them.
* File is added and then replaced with another file before the annex add
stages the symlink in git.
- **Currently unfixed**; `git add` will be run on the new file, which is
- not at all good when it's big. Could be dealt with by using `git
- update-index` to manually put the symlink into the index without git
+ Now fixed; `git annex watch` avoids running `git add` because of this
+ race. Instead, it stages symlinks directly into the index, without
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.
+ Now fixed; same fix as previous race above.
* File is removed and then re-added before the removal event starts.