aboutsummaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-02 15:18:17 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-02 15:18:17 -0400
commit8adf318558c74393fbed0a746465c9b8e29a63a0 (patch)
tree410cbb527939465949ce0f99ac2d2d3f686b74ce /Command
parent81457e02ddf833df56112a8afaf25f57ecd07076 (diff)
annex.largefiles can be configured in .gitattributes too
This is particulary useful for v6 repositories, since the .gitattributes configuration will apply in all clones of the repository.
Diffstat (limited to 'Command')
-rw-r--r--Command/Import.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/Command/Import.hs b/Command/Import.hs
index 847841930..d5a2feed5 100644
--- a/Command/Import.hs
+++ b/Command/Import.hs
@@ -17,7 +17,6 @@ import Remote
import Types.KeySource
import Annex.CheckIgnore
import Annex.NumCopies
-import Types.FileMatcher
import Annex.FileMatcher
cmd :: Command
@@ -67,7 +66,7 @@ seek o = allowConcurrentOutput $ do
largematcher <- largeFilesMatcher
withPathContents (start largematcher (duplicateMode o)) (importFiles o)
-start :: FileMatcher Annex -> DuplicateMode -> (FilePath, FilePath) -> CommandStart
+start :: GetFileMatcher -> DuplicateMode -> (FilePath, FilePath) -> CommandStart
start largematcher mode (srcfile, destfile) =
ifM (liftIO $ isRegularFile <$> getSymbolicLinkStatus srcfile)
( do