From b45b37b088e7b7aef847e40b4b4ae6a417926efd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Sep 2020 14:23:25 -0400 Subject: [PATCH] wait for first pass to complete before second pass Otherwise the bloom filter may not be fully populated when the second pass starts, which could have led to incorrect behavior with --all -J, probably in very rare circumstances. --- Command/Sync.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/Command/Sync.hs b/Command/Sync.hs index 75c6be258c..5b50daf0b2 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -656,6 +656,7 @@ seekSyncContent o rs currbranch = do l <- workTreeItems ww (contentOfOption o) seekworktree mvar l (const noop) pure Nothing + waitForAllRunningCommandActions withKeyOptions' (keyOptions o) False (return (commandAction . gokey mvar bloom)) (const noop) -- 2.30.2