From 62382fa360e16c83eb33634367ede0b95e467c6e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 14 May 2013 13:24:15 -0400
Subject: deal with Cygwin rsync paths issue

---
 Remote/Git.hs   | 2 +-
 Remote/Rsync.hs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Remote')

diff --git a/Remote/Git.hs b/Remote/Git.hs
index 3f88a0334..7c7540543 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -425,7 +425,7 @@ rsyncOrCopyFile rsyncparams src dest p =
 			_ -> watchfilesize oldsz
 #endif
 	dorsync = rsyncHelper (Just p) $
-		rsyncparams ++ [Param src, Param dest]
+		rsyncparams ++ [File src, File dest]
 
 {- Generates rsync parameters that ssh to the remote and asks it
  - to either receive or send the key's content. -}
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 768c15777..f7abbbf2a 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -242,7 +242,7 @@ rsyncRetrieve o k dest callback =
 		-- use inplace when retrieving to support resuming
 		[ Param "--inplace"
 		, Param u
-		, Param dest
+		, File dest
 		]
 
 rsyncRemote :: RsyncOpts -> (Maybe MeterUpdate) -> [CommandParam] -> Annex Bool
@@ -292,7 +292,7 @@ rsyncSend o callback k canrename src = withRsyncScratchDir $ \tmp -> do
 			[ Param "--recursive"
 			, partialParams
 			-- tmp/ to send contents of tmp dir
-			, Param $ addTrailingPathSeparator tmp
+			, File $ addTrailingPathSeparator tmp
 			, Param $ rsyncUrl o
 			]
 		else return False
-- 
cgit v1.2.3