mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix upFrom of "." (and upFrom of "/" on Windows)

Browse source
This commit is contained in:
Joey Hess 2015-01-20 17:23:23 -04:00
parent 4f657aa14e
commit 27c24b7407
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utility/Path.hs
View file

@ -85,7 +85,7 @@ parentDir = takeDirectory . dropTrailingPathSeparator
- parent (ie for "/" or ".") -} - parent (ie for "/" or ".") -}
upFrom :: FilePath -> Maybe FilePath upFrom :: FilePath -> Maybe FilePath
upFrom dir upFrom dir
| null dirs = Nothing | length dirs < 2 = Nothing
| otherwise = Just $ joinDrive drive (join s $ init dirs) | otherwise = Just $ joinDrive drive (join s $ init dirs)
where where
-- on Unix, the drive will be "/" when the dir is absolute, otherwise "" -- on Unix, the drive will be "/" when the dir is absolute, otherwise ""