Skip to content

Commit

Permalink
Merge pull request #53 from datalad/patch-20210211
Browse files Browse the repository at this point in the history
Fix compilation errors on Windows in commit cb7bb3e
  • Loading branch information
yarikoptic authored Feb 11, 2021
2 parents 9061035 + 32c2244 commit 0bd62e1
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions patches/20210211-cb7bb3e4b-windows-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 3ca65c4f6..596c259c5 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -46,6 +46,7 @@ import Logs.Location
import Utility.Metered
import Utility.CopyFile
import Utility.Env
+import Utility.FileMode
import Utility.Batch
import Utility.SimpleProtocol
import Utility.Touch
@@ -70,7 +71,6 @@ import Messages.Progress

#ifndef mingw32_HOST_OS
import qualified Utility.RawFilePath as R
-import Utility.FileMode
#endif

import Control.Concurrent
@@ -654,7 +654,7 @@ copyFromRemoteCheap st repo
)
| otherwise = Nothing
#else
-copyFromRemoteCheap _ _ _ = Nothing
+copyFromRemoteCheap _ _ = Nothing
#endif

{- Tries to copy a key's content to a remote's annex. -}
@@ -927,6 +927,7 @@ newCopyCoWTried = CopyCoWTried <$> newEmptyMVar
fileCopier :: State -> Copier
#ifdef mingw32_HOST_OS
fileCopier _st src dest k meterupdate check verifyconfig = docopy
+ where
#else
fileCopier st src dest k meterupdate check verifyconfig =
-- If multiple threads reach this at the same time, they

0 comments on commit 0bd62e1

Please sign in to comment.