diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-06 15:39:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-06 15:39:51 -0400 |
| commit | 7c7314ae73ce9b2a6059d80e7c356419ed40093c (patch) | |
| tree | d9d8e3211cedc77847d17513413d1d7a9e36c890 /Command | |
| parent | 90d833e44240dd0a83fd2439fa1a23e490959235 (diff) | |
work around git check-ignore --batch bad exit status bug, and bring back import -J
Diffstat (limited to 'Command')
| -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 14216ab73..0dbf2e44a 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 |