From 5b451c18bc4db1865efd25c19817cf885aad0f1d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 May 2016 17:19:07 -0400 Subject: 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. --- Annex/Locations.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Annex/Locations.hs') 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. -} -- cgit v1.2.3