summaryrefslogtreecommitdiff
path: root/Assistant/Threads
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-28 13:47:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-28 13:47:15 -0400
commita3636602ab5b33bf25cef760d4780794841bc8e6 (patch)
tree57b8c7a83bce4df25f014cd9fa31ddce393ea4ab /Assistant/Threads
parent4888c5b0422c8006b4c178503b24bced733931fa (diff)
MVar deadlock problem seems to be fixed by previous commit
Diffstat (limited to 'Assistant/Threads')
-rw-r--r--Assistant/Threads/Merger.hs3
1 files changed, 0 insertions, 3 deletions
diff --git a/Assistant/Threads/Merger.hs b/Assistant/Threads/Merger.hs
index 5d24d1862..c7da86a8d 100644
--- a/Assistant/Threads/Merger.hs
+++ b/Assistant/Threads/Merger.hs
@@ -28,9 +28,6 @@ mergeThread st = do
let dir = Git.localGitDir g </> "refs" </> "heads" </> "synced"
createDirectoryIfMissing True dir
let hook a = Just $ runHandler g a
- -- XXX: For reasons currently unknown, using the ThreadState
- -- inside the watch hooks leads to a MVar deadlock.
- -- Luckily, we don't currently need to do that.
let hooks = mkWatchHooks
{ addHook = hook onAdd
, errHook = hook onErr