From: Joey Hess <joeyh@joeyh.name>
Date: Thu, 5 Nov 2015 22:48:46 +0000 (-0400)
Subject: import -J fails at the end, disable util it can be fixed
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~324^2~94
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=362ab39aadd286b44389cff8d66899d868fb1725;p=git-annex.git

import -J fails at the end, disable util it can be fixed
---

diff --git a/Command/Import.hs b/Command/Import.hs
index 0dbf2e44a5..14216ab734 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
diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn
index ca37b81ebb..48c087aec2 100644
--- a/doc/git-annex-import.mdwn
+++ b/doc/git-annex-import.mdwn
@@ -66,11 +66,6 @@ Several options can be used to adjust handling of duplicate files.
 
 		git annex import /dir --include='*.png'
 
-* `--jobs=N` `-JN`
-
-  Imports multiple files in parallel. This may be faster.
-  For example: `-J4`  
-
 # CAVEATS
 
 Note that using `--deduplicate` or `--clean-duplicates` with the WORM