Merge remote-tracking branch 'gnu/windows' into windows

This commit is contained in:
Joey Hess 2013-05-14 15:45:04 -05:00
commit 813d09678a

View file

@ -71,7 +71,7 @@ fromAbsPath dir
{- When dir == "foo/.git", git looks for "foo/.git/.git", {- When dir == "foo/.git", git looks for "foo/.git/.git",
- and failing that, uses "foo" as the repository. -} - and failing that, uses "foo" as the repository. -}
hunt hunt
| pathSeparator:".git" `isSuffixOf` canondir = | (pathSeparator:".git") `isSuffixOf` canondir =
ifM (doesDirectoryExist $ dir </> ".git") ifM (doesDirectoryExist $ dir </> ".git")
( ret dir ( ret dir
, ret $ takeDirectory canondir , ret $ takeDirectory canondir