From 425bc1107aebdb701cdcee44da731dd918cd470d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Jan 2015 13:11:56 -0400 Subject: 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. --- CmdLine/Seek.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CmdLine') 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)] ) -- cgit v1.2.3