summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-02 00:30:36 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-02 00:31:36 -0400
commit7989943d6a58d14ef1fa02f46067743468137eb5 (patch)
tree89ebb63e2e1af2a0f97b1eb1eae64a504eef0e6f /Assistant
parent5492d8f4ddbd398e0188da9daed840908d1198c0 (diff)
make segmentXargs preserve order
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Committer.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs
index 2951a8018..717a99c96 100644
--- a/Assistant/Threads/Committer.hs
+++ b/Assistant/Threads/Committer.hs
@@ -290,7 +290,7 @@ handleAdds havelsof delayadd cs = returnWhen (null incomplete) $ do
-- files. The ls-files is run on a batch of files.
findnew [] = return ([], noop)
findnew pending@(exemplar:_) = do
- let segments = segmentXargs $ map changeFile pending
+ let segments = segmentXargsUnordered $ map changeFile pending
rs <- liftAnnex $ forM segments $ \fs ->
inRepo (Git.LsFiles.notInRepo False fs)
let (newfiles, cleanup) = foldl'
@@ -457,7 +457,7 @@ safeToAdd havelsof delayadd pending inprocess = do
-}
findopenfiles keysources = ifM crippledFileSystem
( liftIO $ do
- let segments = segmentXargs $ map keyFilename keysources
+ let segments = segmentXargsUnordered $ map keyFilename keysources
concat <$> forM segments (\fs -> Lsof.query $ "--" : fs)
, do
tmpdir <- fromRepo gitAnnexTmpMiscDir