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

work around git check-ignore --batch bad exit status bug, and bring back import -J

Browse source
This commit is contained in:
Joey Hess 2015-11-06 15:39:51 -04:00
parent 7938b87864
commit 53db9d0b5c
Failed to extract signature
3 changed files with 10 additions and 3 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
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