diff options
author | Joey Hess <joey@kitenet.net> | 2014-02-11 16:12:22 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-02-11 16:12:22 -0400 |
commit | 3d87e26c8c24f4417d0943d4e43f0162f8a5b90c (patch) | |
tree | 191901eba04c19826baf3ea65d932e4f6683498b /Git | |
parent | 3c12e914c799df12a297b6eeff3e60f7ab2bf39a (diff) |
remove windows --git-dir unix style path hack
This is no longer necessary, at least with msysgit 1.8.5.2.msysgit.0.
Its root cause may have been fixed by other recent git path fixes.
It was causing the webapp to fail to make repos on other drives.
Diffstat (limited to 'Git')
-rw-r--r-- | Git/Command.hs | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Git/Command.hs b/Git/Command.hs index 034c4ecb5..a4e5c1a4a 100644 --- a/Git/Command.hs +++ b/Git/Command.hs @@ -25,18 +25,10 @@ gitCommandLine :: [CommandParam] -> Repo -> [CommandParam] gitCommandLine params r@(Repo { location = l@(Local _ _ ) }) = setdir : settree ++ gitGlobalOpts r ++ params where - setdir = Param $ "--git-dir=" ++ gitpath (gitdir l) + setdir = Param $ "--git-dir=" ++ gitdir l settree = case worktree l of Nothing -> [] Just t -> [Param $ "--work-tree=" ++ gitpath t] -#ifdef mingw32_HOST_OS - -- despite running on windows, msysgit wants a unix-formatted path - gitpath s - | absoluteGitPath s = "/" ++ dropDrive (toInternalGitPath s) - | otherwise = s -#else - gitpath = id -#endif gitCommandLine _ repo = assertLocal repo $ error "internal" {- Runs git in the specified repo. -} |