diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-04-02 01:18:00 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-02 01:20:07 -0400 |
| commit | 69b92b22d9a80055c94d687b7f0810f82776624a (patch) | |
| tree | fd3de714d4a333c1ff288c8cf7f146909c366203 | |
| parent | 9831ae65a5afefb476149645fd7df341c065754c (diff) | |
Fix truncation of parameters that could occur when using xargs git-annex.
This will only ever result in a few more git-ls-files being run than were run
before. (Only 1 more is really needed, but around 10 more are currently run
for a max length command line.)
So, no need to worry about the extra zombie, or lost laziness due to concat.
| -rw-r--r-- | CmdLine/Seek.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/feeding_git_annex_with_xargs_can_fail.mdwn | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index b5726f53e..1db075ec3 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -215,8 +215,8 @@ seekActions gen = do seekHelper :: ([FilePath] -> Git.Repo -> IO ([FilePath], IO Bool)) -> [FilePath] -> Annex [FilePath] seekHelper a params = do - ll <- inRepo $ \g -> - runSegmentPaths (\fs -> Git.Command.leaveZombie <$> a fs g) params + ll <- inRepo $ \g -> concat <$> forM (segmentXargsOrdered params) + (runSegmentPaths (\fs -> Git.Command.leaveZombie <$> a fs g)) forM_ (map fst $ filter (null . snd) $ zip params ll) $ \p -> unlessM (isJust <$> liftIO (catchMaybeIO $ getSymbolicLinkStatus p)) $ error $ p ++ " not found" diff --git a/debian/changelog b/debian/changelog index dbea98877..6b88aa228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ git-annex (5.20150328) UNRELEASED; urgency=medium for distributed fsck. * Significantly sped up processing of large numbers of directories passed to a single git-annex command. + * Fix truncation of parameters that could occur when using xargs git-annex. -- Joey Hess <id@joeyh.name> Fri, 27 Mar 2015 16:04:43 -0400 diff --git a/doc/bugs/feeding_git_annex_with_xargs_can_fail.mdwn b/doc/bugs/feeding_git_annex_with_xargs_can_fail.mdwn index 729d0d2fb..ebbc1e7e9 100644 --- a/doc/bugs/feeding_git_annex_with_xargs_can_fail.mdwn +++ b/doc/bugs/feeding_git_annex_with_xargs_can_fail.mdwn @@ -5,6 +5,8 @@ Feeding git-annex a long list off directories, eg with xargs can have ls-files command is longer than the git-annex command often, so it gets truncated and some files are not processed. + > [[fixed|done]] --[[Joey]] + * It can take a really long time for git-annex to chew through the git-ls-files results. There is probably an exponential blowup in the time relative to the number of parameters. Some of the stuff being done to |