diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:29:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 18:55:56 -0400 |
| commit | 2bba5bc22d049272d3328bfa6c452d3e2e50e86c (patch) | |
| tree | 19feab50e43dc330038224ea98b371916ca02133 /Remote/Git.hs | |
| parent | 014e909a449d0822eff4962a504d6a524abe8fc7 (diff) | |
made parentDir return a Maybe FilePath; removed most uses of it
parentDir is less safe than takeDirectory, especially when working
with relative FilePaths. It's really only useful in loops that
want to terminate at /
This commit was sponsored by Audric SCHILTKNECHT.
Diffstat (limited to 'Remote/Git.hs')
| -rw-r--r-- | Remote/Git.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs index 17b44fa6e..8e521cfe9 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -556,7 +556,7 @@ rsyncOrCopyFile rsyncparams src dest p = ifM (sameDeviceIds src dest) (docopy, dorsync) where sameDeviceIds a b = (==) <$> getDeviceId a <*> getDeviceId b - getDeviceId f = deviceID <$> liftIO (getFileStatus $ parentDir f) + getDeviceId f = deviceID <$> liftIO (getFileStatus $ takeDirectory f) docopy = liftIO $ bracket (forkIO $ watchfilesize zeroBytesProcessed) (void . tryIO . killThread) |