diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-06-26 12:15:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-06-26 12:15:55 -0400 |
| commit | 63f9aba33b45e5bab688ffaa5e4182801c152828 (patch) | |
| tree | 1f4e16640503b27bbd0f33241cbe1cb2c4a4eb89 /Utility/Directory.hs | |
| parent | c799b05deae723690bfac5e867f7985e8f800d0d (diff) | |
| download | git-repair-63f9aba33b45e5bab688ffaa5e4182801c152828.tar.gz | |
merge from git-annex
Removes dependency on MissingH, adding a dependency on split instead.
This commit was sponsored by Brock Spratlen on Patreon.
Diffstat (limited to 'Utility/Directory.hs')
| -rw-r--r-- | Utility/Directory.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Directory.hs b/Utility/Directory.hs index 693e771..c24f36d 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -96,10 +96,10 @@ dirTreeRecursiveSkipping skipdir topdir = go [] [topdir] go c (dir:dirs) | skipdir (takeFileName dir) = go c dirs | otherwise = unsafeInterleaveIO $ do - subdirs <- go c + subdirs <- go [] =<< filterM (isDirectory <$$> getSymbolicLinkStatus) =<< catchDefaultIO [] (dirContents dir) - go (subdirs++[dir]) dirs + go (subdirs++dir:c) dirs {- Moves one filename to another. - First tries a rename, but falls back to moving across devices if needed. -} |