mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2015-11-05 18:48:46 -04:00
parent 7dc90f2225
commit 362ab39aad
Failed to extract signature
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/Import.hs
View file

@ -21,7 +21,7 @@ import Annex.CheckIgnore
import Annex.NumCopies import Annex.NumCopies
cmd :: Command cmd :: Command
cmd = withGlobalOptions (jobsOption : fileMatchingOptions) $ notBareRepo $ cmd = withGlobalOptions fileMatchingOptions $ notBareRepo $
command "import" SectionCommon command "import" SectionCommon
"move and add files from outside git working copy" "move and add files from outside git working copy"
paramPaths (seek <$$> optParser) paramPaths (seek <$$> optParser)
@ -59,7 +59,7 @@ duplicateModeParser =
) )
seek :: ImportOptions -> CommandSeek seek :: ImportOptions -> CommandSeek
seek o = allowConcurrentOutput $ do seek o = do
repopath <- liftIO . absPath =<< fromRepo Git.repoPath repopath <- liftIO . absPath =<< fromRepo Git.repoPath
inrepops <- liftIO $ filter (dirContains repopath) <$> mapM absPath (importFiles o) inrepops <- liftIO $ filter (dirContains repopath) <$> mapM absPath (importFiles o)
unless (null inrepops) $ do unless (null inrepops) $ do

5
doc/git-annex-import.mdwn
View file

@ -66,11 +66,6 @@ Several options can be used to adjust handling of duplicate files.
git annex import /dir --include='*.png' git annex import /dir --include='*.png'
* `--jobs=N` `-JN`
Imports multiple files in parallel. This may be faster.
For example: `-J4`
# CAVEATS # CAVEATS
Note that using `--deduplicate` or `--clean-duplicates` with the WORM Note that using `--deduplicate` or `--clean-duplicates` with the WORM