From 5b016d04f85e3acde643a4476d1ed5802bdce044 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 May 2013 16:32:03 -0500 Subject: fill in a few windows stubs --- Git/Construct.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 Git/Construct.hs (limited to 'Git') diff --git a/Git/Construct.hs b/Git/Construct.hs old mode 100644 new mode 100755 index b947abd89..54eb84e22 --- a/Git/Construct.hs +++ b/Git/Construct.hs @@ -34,6 +34,7 @@ import Network.URI import Common import Git.Types import Git +import Git.FilePath import qualified Git.Url as Url import Utility.UserInfo @@ -58,8 +59,7 @@ fromPath dir = fromAbsPath =<< absPath dir - specified. -} fromAbsPath :: FilePath -> IO Repo fromAbsPath dir - | isAbsolute dir = - ifM (doesDirectoryExist dir') ( ret dir' , hunt ) + | isAbsolute dir = ifM (doesDirectoryExist dir') ( ret dir' , hunt ) | otherwise = error $ "internal error, " ++ dir ++ " is not absolute" where @@ -146,7 +146,7 @@ fromRemoteLocation s repo = gen $ calcloc s where gen v #ifdef __WINDOWS__ - | dosstyle v = fromRemotePath v repo + | dosstyle v = fromRemotePath (dospath v) repo #endif | scpstyle v = fromUrl $ scptourl v | urlstyle v = fromUrl v @@ -185,6 +185,7 @@ fromRemoteLocation s repo = gen $ calcloc s -- git on Windows will write a path to .git/config with "drive:", -- which is not to be confused with a "host:" dosstyle = hasDrive + dospath = fromInternalGitPath #endif {- Constructs a Repo from the path specified in the git remotes of -- cgit v1.2.3