From 261a91338392e5f904fdc05694b75a71f1faa17e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 5 Nov 2015 18:48:46 -0400 Subject: import -J fails at the end, disable util it can be fixed --- Command/Import.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Command') diff --git a/Command/Import.hs b/Command/Import.hs index 0dbf2e44a..14216ab73 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -21,7 +21,7 @@ import Annex.CheckIgnore import Annex.NumCopies cmd :: Command -cmd = withGlobalOptions (jobsOption : fileMatchingOptions) $ notBareRepo $ +cmd = withGlobalOptions fileMatchingOptions $ notBareRepo $ command "import" SectionCommon "move and add files from outside git working copy" paramPaths (seek <$$> optParser) @@ -59,7 +59,7 @@ duplicateModeParser = ) seek :: ImportOptions -> CommandSeek -seek o = allowConcurrentOutput $ do +seek o = do repopath <- liftIO . absPath =<< fromRepo Git.repoPath inrepops <- liftIO $ filter (dirContains repopath) <$> mapM absPath (importFiles o) unless (null inrepops) $ do -- cgit v1.2.3