summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-29 14:58:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-29 14:58:13 -0400
commitcdb47af26e621d15ade0a488597d9a228d4d430e (patch)
treeab2161bdb79c16cea21a604e24fd4d2d973697b8 /Assistant
parent992eb6d6931cfc2ca8da0fe2d25e58742ce8cd77 (diff)
avoid double commits with inotify when direct mode file is created
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Watcher.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index a69ab6a09..1c5d7206b 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -69,7 +69,6 @@ watchThread = NamedThread "Watcher" $ do
errhook <- hook onErr
let hooks = mkWatchHooks
{ addHook = addhook
- , modifyHook = addhook
, delHook = delhook
, addSymlinkHook = addsymlinkhook
, delDirHook = deldirhook
@@ -143,10 +142,10 @@ onAddDirect file fs = do
case (v, fs) of
(Just key, Just filestatus) ->
ifM (liftAnnex $ changedFileStatus key filestatus)
- ( noChange
- , do
+ ( do
liftAnnex $ changedDirect key file
pendingAddChange file
+ , noChange
)
_ -> pendingAddChange file