diff options
author | Joey Hess <joey@kitenet.net> | 2014-02-08 15:31:03 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-02-08 15:39:04 -0400 |
commit | b1915b9054ffa57e84c1300ac0d0d9bc1c7af20d (patch) | |
tree | c4b7771e493a5c8997e04dcf93868e6d5b94fe89 /Git/FilePath.hs | |
parent | 97f152eff1d9b1c7543844dacda8c264aadede9f (diff) |
Windows: Fix handling of absolute unix-style git repository paths.
Note that on Windows a remote with a path like /home/foo/bar
is interpreted by git as being some screwy relative path (relative to what
exactly seems ill-defined -- it seemed relative to C:\Program Files\Git\ in
my tests!) So no attempt has been made to handle such a path sanely, just not
to crash when encountering it.
Note that "C:\\foo" </> "/home/foo/bar" yields /home/foo/bar even though
that is not absolute! I don't know what to make of all this,
except that I will be very happy when this crock of **** vanishes from
the face of the earth.
Diffstat (limited to 'Git/FilePath.hs')
-rw-r--r-- | Git/FilePath.hs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Git/FilePath.hs b/Git/FilePath.hs index a128277dc..42eb0812e 100644 --- a/Git/FilePath.hs +++ b/Git/FilePath.hs @@ -20,12 +20,15 @@ module Git.FilePath ( asTopFilePath, InternalGitPath, toInternalGitPath, - fromInternalGitPath + fromInternalGitPath, + absoluteGitPath ) where import Common import Git +import qualified System.FilePath.Posix + {- A FilePath, relative to the top of the git repository. -} newtype TopFilePath = TopFilePath { getTopFilePath :: FilePath } deriving (Show) @@ -66,3 +69,10 @@ fromInternalGitPath = id #else fromInternalGitPath = replace "/" "\\" #endif + +{- isAbsolute on Windows does not think "/foo" or "\foo" is absolute, + - so try posix paths. + -} +absoluteGitPath :: FilePath -> Bool +absoluteGitPath p = isAbsolute p || + System.FilePath.Posix.isAbsolute (toInternalGitPath p) |