diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:48:46 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-05 18:48:46 -0400 |
| commit | 261a91338392e5f904fdc05694b75a71f1faa17e (patch) | |
| tree | 0c40c28ed9899d1c74df739869d8091e238710da | |
| parent | eab4110a9010f1654724e712b8fe2d675132a7ef (diff) | |
import -J fails at the end, disable util it can be fixed
| -rw-r--r-- | Command/Import.hs | 4 | ||||
| -rw-r--r-- | doc/git-annex-import.mdwn | 5 |
2 files changed, 2 insertions, 7 deletions
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 diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn index ca37b81eb..48c087aec 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 |