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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Limit.hs
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

2
debian/changelog vendored
View file

@ -16,6 +16,8 @@ git-annex (6.20160319) UNRELEASED; urgency=medium
* sync: Show output of git commit.
* annex.thin and annex.hardlink are now supported on Windows.
* unannex --fast now makes hard links on Windows.
* Fix bug in annex.largefiles mimetype= matching when git-annex
is run in a subdirectory of the repository.
-- Joey Hess <id@joeyh.name> Wed, 23 Mar 2016 11:42:36 -0400

3
doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn
View file

@ -72,3 +72,6 @@ lrwxrwxrwx 1 vagrant vagrant 189 Apr 6 15:20 tempfile -> ../.git/annex/object
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
> Thanks for reporting. This was a dumb bug; it used the wrong path to the
> file for mimetype=, which was relative to the top of the repository.
> [[fixed|done]] --[[Joey]]