summaryrefslogtreecommitdiff
path: root/Types/Difference.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2019-12-20 15:01:34 -0400
committerJoey Hess <joeyh@joeyh.name>2019-12-20 15:56:25 -0400
commit37467a008f15aca723594c77b71cd26a3ad39952 (patch)
treec9ee337c5f9cdba4c02f86a22881633a9838650f /Types/Difference.hs
parentf79bd5213248cd1f9c77189408242dc7a5f177e3 (diff)
annex.addunlocked expressions
* annex.addunlocked can be set to an expression with the same format used by annex.largefiles, in case you want to default to unlocking some files but not others. * annex.addunlocked can be configured by git-annex config. Added a git-annex-matching-expression man page, broken out from tips/largefiles. A tricky consequence of this is that git-annex add --relaxed honors annex.addunlocked, but an expression might want to know the size or content of an url, which it's not going to download. I decided it was better not to fail, and just dummy up some plausible data in that case. Performance impact should be negligible. The global config is already loaded for annex.largefiles. The expression only has to be parsed once, and in the simple true/false case, it should not do any additional work matching it.
Diffstat (limited to 'Types/Difference.hs')
-rw-r--r--Types/Difference.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Types/Difference.hs b/Types/Difference.hs
index a974e332a5..754fb71a7d 100644
--- a/Types/Difference.hs
+++ b/Types/Difference.hs
@@ -96,7 +96,7 @@ getDifferences :: Git.Repo -> Differences
getDifferences r = mkDifferences $ S.fromList $
mapMaybe getmaybe [minBound .. maxBound]
where
- getmaybe d = case Git.Config.isTrue' =<< Git.Config.getMaybe (differenceConfigKey d) r of
+ getmaybe d = case Git.Config.isTrueFalse' =<< Git.Config.getMaybe (differenceConfigKey d) r of
Just True -> Just d
_ -> Nothing