work around git check-ignore --batch bad exit status bug, and bring back import -J
This commit is contained in:
parent
7938b87864
commit
53db9d0b5c
3 changed files with 10 additions and 3 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue