diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-09 13:11:56 -0400 |
| commit | 425bc1107aebdb701cdcee44da731dd918cd470d (patch) | |
| tree | 25bcacb37277b70aa7bd0caaf0fe7c3edc665653 /CmdLine | |
| parent | 20c7644a4d85434cf49840ea92fca0c723710c72 (diff) | |
revert parentDir change
Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c
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.
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/Seek.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index b35e39ba0..9a874807b 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -70,7 +70,7 @@ withPathContents a params = seekActions $ map a . concat <$> liftIO (mapM get params) where get p = ifM (isDirectory <$> getFileStatus p) - ( map (\f -> (f, makeRelative (takeDirectory p) f)) + ( map (\f -> (f, makeRelative (parentDir p) f)) <$> dirContentsRecursiveSkipping (".git" `isSuffixOf`) True p , return [(p, takeFileName p)] ) |