From 6e765717650f0270cdc497d38245bcbc4180e60c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 Jan 2015 16:51:40 -0400 Subject: implement annex.tune.objecthashlower Split out Annex.DirHashes which never really belonged in Locations. --- Remote/Git.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Remote/Git.hs') diff --git a/Remote/Git.hs b/Remote/Git.hs index b31a1d850..328e39111 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -327,13 +327,15 @@ keyUrls r key = map tourl locs' -- If the remote is known to not be bare, try the hash locations -- used for non-bare repos first, as an optimisation. locs - | remoteAnnexBare (gitconfig r) == Just False = reverse (annexLocations key) - | otherwise = annexLocations key + | remoteAnnexBare remoteconfig == Just False = reverse (annexLocations cfg key) + | otherwise = annexLocations cfg key #ifndef mingw32_HOST_OS locs' = locs #else locs' = map (replace "\\" "/") locs #endif + remoteconfig = gitconfig r + cfg = fromJust $ remoteGitConfig remoteconfig dropKey :: Remote -> Key -> Annex Bool dropKey r key -- cgit v1.2.3