aboutsummaryrefslogtreecommitdiff
path: root/Annex/Locations.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-05-16 17:19:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-05-16 17:19:07 -0400
commit5b451c18bc4db1865efd25c19817cf885aad0f1d (patch)
treef2570a0f120325071d9c1601742d9728d3feb899 /Annex/Locations.hs
parent26e4d57a9537ea3ae0c3c3b6601ee19bdd5bf50b (diff)
avoid checking locations in regular repo
In commit 07b1aa343b6d82e8f75de606a5647b0a789f76e0 I accidentially made gitAnnexLocation do more work, checking content locations, when used in a regular repo.
Diffstat (limited to 'Annex/Locations.hs')
-rw-r--r--Annex/Locations.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/Locations.hs b/Annex/Locations.hs
index a19560682..0d71ef92e 100644
--- a/Annex/Locations.hs
+++ b/Annex/Locations.hs
@@ -151,8 +151,9 @@ gitAnnexLocation' key r config crippled symlinkssupported checker gitdir
- for new content, unless symlinks are supported too.
- Then hashDirMixed is used. But, the content could be
- in either location so check both. -}
- | symlinkssupported = check $ map inrepo $ reverse $ annexLocations config key
- | crippled = checkall
+ | crippled = if symlinkssupported
+ then check $ map inrepo $ reverse $ annexLocations config key
+ else checkall
{- Regular repositories only use hashDirMixed, so
- don't need to do any work to check if the file is
- present. -}