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

move unspecifiedAttr check to checkAttr

Browse source 
It just so happens that everywhere that checks attrs other than
annex.largefiles parses the value further, and failed to parse
unspecifiedAttr in a way that behaved the same as if nothing was set. So
this is not a bug fix or behavior change. What it does so is prevent
future uses of checkAttr from needing to remember to handle checking for
this edge case.

Sponsored-by: Dartmouth College's DANDI project
This commit is contained in:
Joey Hess 2023-06-12 14:37:42 -04:00
parent 38153ad340
commit ae98fb1b31
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/CheckAttr.hs
View file

@ -29,8 +29,11 @@ annexAttrs =
] ]
checkAttr :: Git.Attr -> RawFilePath -> Annex String checkAttr :: Git.Attr -> RawFilePath -> Annex String
checkAttr attr file = withCheckAttrHandle $ \h -> checkAttr attr file = withCheckAttrHandle $ \h -> do
liftIO $ Git.checkAttr h attr file r <- liftIO $ Git.checkAttr h attr file
if r == Git.unspecifiedAttr
then return ""
else return r
checkAttrs :: [Git.Attr] -> RawFilePath -> Annex [String] checkAttrs :: [Git.Attr] -> RawFilePath -> Annex [String]
checkAttrs attrs file = withCheckAttrHandle $ \h -> checkAttrs attrs file = withCheckAttrHandle $ \h ->

3
Annex/FileMatcher.hs
View file

@ -43,7 +43,6 @@ import Git.FilePath
import Types.Remote (RemoteConfig) import Types.Remote (RemoteConfig)
import Types.ProposedAccepted import Types.ProposedAccepted
import Annex.CheckAttr import Annex.CheckAttr
import Git.CheckAttr (unspecifiedAttr)
import qualified Git.Config import qualified Git.Config
#ifdef WITH_MAGICMIME #ifdef WITH_MAGICMIME
import Annex.Magic import Annex.Magic
@ -233,7 +232,7 @@ largeFilesMatcher = go =<< getGitConfigVal' annexLargeFiles
return $ const $ return matcher return $ const $ return matcher
go v = return $ \file -> do go v = return $ \file -> do
expr <- checkAttr "annex.largefiles" file expr <- checkAttr "annex.largefiles" file
if null expr || expr == unspecifiedAttr if null expr
then case v of then case v of
HasGlobalConfig (Just expr') -> HasGlobalConfig (Just expr') ->
mkmatcher expr' "git-annex config" mkmatcher expr' "git-annex config"