diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-04-12 14:19:34 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-04-12 14:19:34 -0400 |
| commit | 9c585954aeba1ead782ca7d91e4695270266e851 (patch) | |
| tree | 528a0723815d2e069f0130f4b162669f1fcc97a5 | |
| parent | 7ffc39da51a2606166ba1ed0897145bb906439f5 (diff) | |
Fix bug in annex.largefiles mimetype= matching when git-annex is run in a subdirectory of the repository.
| -rw-r--r-- | Limit.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn | 3 |
3 files changed, 6 insertions, 1 deletions
@@ -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 diff --git a/debian/changelog b/debian/changelog index bfde90da1..a455655c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn b/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn index 9452cbff2..7eb1332a2 100644 --- a/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn +++ b/doc/bugs/largefiles_not_working_when_set_in_.gitattributes.mdwn @@ -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]] |