Merge branch 'master' into relativepaths
Conflicts: Locations.hs debian/changelog
This commit is contained in:
commit
858d776352
61 changed files with 238 additions and 122 deletions
|
@ -46,8 +46,8 @@ fromCwd = getCurrentDirectory >>= seekUp
|
|||
r <- checkForRepo dir
|
||||
case r of
|
||||
Nothing -> case parentDir dir of
|
||||
"" -> return Nothing
|
||||
d -> seekUp d
|
||||
Nothing -> return Nothing
|
||||
Just d -> seekUp d
|
||||
Just loc -> Just <$> newFrom loc
|
||||
|
||||
{- Local Repo constructor, accepts a relative or absolute path. -}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue