diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
| commit | 36852d90bc18cb7b2bddb1ce9dce39cc1f0203de (patch) | |
| tree | 0419a1d67f6bb9db4ce79f8cb76b53752e2d7371 /Utility/Directory.hs | |
| parent | efe7e174bfab4d0dd2e88e7b6eb859940b2228ea (diff) | |
| download | git-repair-36852d90bc18cb7b2bddb1ce9dce39cc1f0203de.tar.gz | |
Merge from git-annex.
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 e4e4b80..2e037fd 100644 --- a/Utility/Directory.hs +++ b/Utility/Directory.hs @@ -1,6 +1,6 @@ {- directory traversal and manipulation - - - Copyright 2011-2014 Joey Hess <joey@kitenet.net> + - Copyright 2011-2014 Joey Hess <id@joeyh.name> - - License: BSD-2-clause -} @@ -111,7 +111,7 @@ moveFile src dest = tryIO (rename src dest) >>= onrename -- But, mv will move into a directory if -- dest is one, which is not desired. whenM (isdir dest) rethrow - viaTmp mv dest undefined + viaTmp mv dest "" where rethrow = throwM e mv tmp _ = do |