summaryrefslogtreecommitdiff
path: root/Remote/Git.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 16:51:40 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 16:52:08 -0400
commit6e765717650f0270cdc497d38245bcbc4180e60c (patch)
treec989f13da5507d8f46fdfa1b36f1ce0aa77aca2f /Remote/Git.hs
parent82161654830b0dc4187e9928555c9321ef61bb89 (diff)
implement annex.tune.objecthashlower
Split out Annex.DirHashes which never really belonged in Locations.
Diffstat (limited to 'Remote/Git.hs')
-rw-r--r--Remote/Git.hs6
1 files changed, 4 insertions, 2 deletions
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