revert parentDir change
Reverts 965e106f24
Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
This commit is contained in:
parent
2fff78512d
commit
3bab5dfb1d
47 changed files with 99 additions and 96 deletions
|
@ -46,8 +46,8 @@ fromCwd = getCurrentDirectory >>= seekUp
|
|||
r <- checkForRepo dir
|
||||
case r of
|
||||
Nothing -> case parentDir dir of
|
||||
Nothing -> return Nothing
|
||||
Just d -> seekUp d
|
||||
"" -> return Nothing
|
||||
d -> seekUp d
|
||||
Just loc -> Just <$> newFrom loc
|
||||
|
||||
{- Local Repo constructor, accepts a relative or absolute path. -}
|
||||
|
|
|
@ -244,7 +244,7 @@ explodePackedRefsFile r = do
|
|||
where
|
||||
makeref (sha, ref) = do
|
||||
let dest = localGitDir r </> fromRef ref
|
||||
createDirectoryIfMissing True (takeDirectory dest)
|
||||
createDirectoryIfMissing True (parentDir dest)
|
||||
unlessM (doesFileExist dest) $
|
||||
writeFile dest (fromRef sha)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue