diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-03-26 14:02:35 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-26 14:02:35 -0400 |
| commit | e4c72d1a1e0dca1612ff1b24d5afd058d3adc9b6 (patch) | |
| tree | cb52ba10b7f698c1be71e2aa19b02c89d6e921d1 /Assistant | |
| parent | 8e377f1ea3471f7c0af3435ba801cb805bf646d2 (diff) | |
assistant: Committing a whole lot of files at once could overflow command-line length limits and cause the commit to fail. This only happened when using the assistant in an indirect mode repository.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index 8fecc1c51..2951a8018 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -290,8 +290,12 @@ 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 - (newfiles, cleanup) <- liftAnnex $ - inRepo (Git.LsFiles.notInRepo False $ map changeFile pending) + let segments = segmentXargs $ map changeFile pending + rs <- liftAnnex $ forM segments $ \fs -> + inRepo (Git.LsFiles.notInRepo False fs) + let (newfiles, cleanup) = foldl' + (\(l1, a1) (l2, a2) -> (l1 ++ l2, a1 >> a2)) + ([], return True) rs -- note: timestamp info is lost here let ts = changeTime exemplar return (map (PendingAddChange ts) newfiles, void $ liftIO cleanup) |