From e0187d5d12ed35b853b3bec6bd7bd024a04512eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 28 Jan 2015 18:01:54 -0400
Subject: [PATCH] test suite found a problem with today's work

". def" did not do what I thought it would, at all.
---
 Locations.hs             | 2 +-
 Remote/Rsync.hs          | 4 ++--
 Remote/Rsync/RsyncUrl.hs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Locations.hs b/Locations.hs
index a9847f460d..c5221d8bc7 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -426,4 +426,4 @@ keyPath key hasher = hasher key </> f </> f
  - special remotes and git-annex repos.
  -}
 keyPaths :: Key -> [FilePath]
-keyPaths key = map (keyPath key . def) dirHashes
+keyPaths key = map (\h -> keyPath key (h def)) dirHashes
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index da258551b3..f5d4c85c44 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -213,8 +213,8 @@ remove o k = do
 	 - content could be. Note that the parent directories have
 	 - to also be explicitly included, due to how rsync
 	 - traverses directories. -}
-	includes = concatMap (use .def) dirHashes
-	use h = let dir = h k in
+	includes = concatMap use dirHashes
+	use h = let dir = h def k in
 		[ parentDir dir
 		, dir
 		-- match content directory and anything in it
diff --git a/Remote/Rsync/RsyncUrl.hs b/Remote/Rsync/RsyncUrl.hs
index 0cb1733c6e..9a73192466 100644
--- a/Remote/Rsync/RsyncUrl.hs
+++ b/Remote/Rsync/RsyncUrl.hs
@@ -37,12 +37,12 @@ rsyncEscape o u
 	| otherwise = u
 
 rsyncUrls :: RsyncOpts -> Key -> [RsyncUrl]
-rsyncUrls o k = map (use . def) dirHashes
+rsyncUrls o k = map use dirHashes
   where
 	use h = rsyncUrl o </> hash h </> rsyncEscape o (f </> f)
 	f = keyFile k
 #ifndef mingw32_HOST_OS
-	hash h = h k
+	hash h = h def k
 #else
 	hash h = replace "\\" "/" (h k)
 #endif