Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository.

This commit is contained in:
Joey Hess 2016-04-12 14:19:34 -04:00
parent c672481352
commit eac26f13db
Failed to extract signature
3 changed files with 6 additions and 1 deletions

View file

@ -104,7 +104,7 @@ matchMagic (Just magic) glob = Right $ const go
cglob = compileGlob glob CaseSensative -- memoized
go (MatchingKey _) = pure False
go (MatchingFile fi) = liftIO $ catchBoolIO $
matchGlob cglob <$> magicFile magic (matchFile fi)
matchGlob cglob <$> magicFile magic (currFile fi)
go (MatchingInfo _ _ _ mimeval) = matchGlob cglob <$> getInfo mimeval
matchMagic Nothing _ = Left "unable to load magic database; \"mimetype\" cannot be used"
#endif