diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:24:15 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:24:15 -0400 |
| commit | d8a1741254643a7c5b324cabe8c00e36b58434d8 (patch) | |
| tree | 6390bcea81c5b8271e92a07de4b8c8e20de9f4bf /Command/Import.hs | |
| parent | a2c9cbbdc4047b799321ec388a94d4f96951a6f2 (diff) | |
-J for add/addurl/import
Diffstat (limited to 'Command/Import.hs')
| -rw-r--r-- | Command/Import.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Import.hs b/Command/Import.hs index a96c08055..3ace2d2b0 100644 --- a/Command/Import.hs +++ b/Command/Import.hs @@ -21,7 +21,7 @@ import Annex.CheckIgnore import Annex.NumCopies cmd :: Command -cmd = withGlobalOptions fileMatchingOptions $ notBareRepo $ +cmd = withGlobalOptions (jobsOption : 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 = do +seek o = allowConcurrentOutput $ do repopath <- liftIO . absPath =<< fromRepo Git.repoPath inrepops <- liftIO $ filter (dirContains repopath) <$> mapM absPath (importFiles o) unless (null inrepops) $ do |